D1302.id3344.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1302.id3344.diff
View Options

	diff --git a/pillar/webserver/wwwroot51.sls b/pillar/webserver/wwwroot51.sls
	--- a/pillar/webserver/wwwroot51.sls
	+++ b/pillar/webserver/wwwroot51.sls
	@@ -8,7 +8,15 @@
	wwwroot51_basedir: /var/51-wwwroot

	wwwroot51_directories:
	+ api:
	+ user: dereckson
	+ group: dereckson
	+ repository: ssh://vcs@devcentral.nasqueron.org:5022/source/api.git
	tools:
	user: dereckson
	group: dereckson
	repository: ssh://vcs@devcentral.nasqueron.org:5022/source/tools.git
	+ www:
	+ user: dereckson
	+ group: dereckson
	+ repository: ssh://vcs@devcentral.nasqueron.org:5022/source/www.git
	diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
	--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
	+++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
	@@ -36,3 +36,26 @@

	include includes/letsencrypt;
	}
	+
	+server {
	+ listen 80;
	+ listen [::]:80;
	+ server_name api51.nasqueron.org;
	+
	+ include includes/letsencrypt;
	+
	+ return 301 https://api51.nasqueron.org$request_uri;
	+}
	+
	+server {
	+ server_name api51.nasqueron.org;
	+
	+ include includes/tls;
	+ ssl_certificate /usr/local/etc/letsencrypt/live/www51.nasqueron.org/fullchain.pem;
	+ ssl_certificate_key /usr/local/etc/letsencrypt/live/www51.nasqueron.org/privkey.pem;
	+
	+ error_log /var/log/www/nasqueron.org/api51-error.log;
	+ access_log /var/log/www/nasqueron.org/api51-access.log;
	+
	+ root /var/51-wwwroot/api;
	+}