D956.id2438.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D956.id2438.diff
View Options

	diff --git a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf
	--- a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf
	+++ b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf
	@@ -24,18 +24,17 @@
	listen [2001:470:1f12:9e1::2]:80;
	listen [2001:470:1f13:9e1:0:c0ff:ee:1]:80;
	server_name _;
	- root /var/wwwroot/unknown_domains;

	access_log /var/log/www/unknown_domains-access.log main;
	error_log /var/log/www/unknown_domains-error.log;

	- error_page 404 @unknowndomains;
	-
	location / {
	return 404;
	}

	- location @unknowndomains {
	- rewrite ^(.*)$ /unknown.html break;
	+ error_page 404 /unknown.html;
	+
	+ location = /unknown.html {
	+ root /var/wwwroot/unknown_domains;
	}
	}
	diff --git a/roles/shellserver/web-hosting/init.sls b/roles/shellserver/web-hosting/init.sls
	--- a/roles/shellserver/web-hosting/init.sls
	+++ b/roles/shellserver/web-hosting/init.sls
	@@ -22,14 +22,10 @@
	- clean: False
	- dir_mode: 755
	- file_mode: 644
	- - cmd.run:
	- - name: nginx -s reload
	- - onchanges:
	- {% if grains['os'] == 'FreeBSD' %}
	- - file: /usr/local/etc/nginx/nginx.conf
	- {% else %}
	- - file: /etc/nginx/nginx.conf
	- {% endif %}
	+ cmd.run:
	+ - name: nginx -s reload
	+ - onchanges:
	+ - file: nginx_config_files

	# -------------------------------------------------------------
	# Nginx logs