D1713.id4350.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1713.id4350.diff
View Options

	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -64,6 +64,9 @@
	etherpad:
	app_port: 34080
	host: pad.nasqueron.org
	+ aliases:
	+ - pad.wolfplex.org
	+ - pad.wolfplex.be
	mysql_link: acquisitariat
	plugins:
	- ep_ether-o-meter
	diff --git a/roles/paas-docker/nginx/config.sls b/roles/paas-docker/nginx/config.sls
	--- a/roles/paas-docker/nginx/config.sls
	+++ b/roles/paas-docker/nginx/config.sls
	@@ -37,6 +37,9 @@
	- context:
	fqdn: {{ args['host'] }}
	app_port: {{ args['app_port'] }}
	+ {% if 'aliases' in args %}
	+ aliases: {{ args['aliases']\|join(" ") }}
	+ {% endif %}

	{% endif %}
	{% endfor %}
	diff --git a/roles/paas-docker/nginx/files/vhosts/etherpad.conf b/roles/paas-docker/nginx/files/vhosts/etherpad.conf
	--- a/roles/paas-docker/nginx/files/vhosts/etherpad.conf
	+++ b/roles/paas-docker/nginx/files/vhosts/etherpad.conf
	@@ -16,7 +16,7 @@
	server {
	listen 80;
	listen [::]:80;
	- server_name {{ fqdn }};
	+ server_name {{ fqdn }} {{ aliases }};

	include includes/letsencrypt;

	@@ -24,7 +24,7 @@
	}

	server {
	- server_name {{ fqdn }};
	+ server_name {{ fqdn }} {{ aliases }};

	include includes/tls;
	ssl_certificate /srv/letsencrypt/etc/live/{{ fqdn }}/fullchain.pem;