Consolidate nginx configs

basic/etc/nginx/conf.d/default.conf

@@ -1,12 +1,10 @@
 server {
-    listen 80 default_server;
+    listen [::]:80 default_server ipv6only=off;
-    listen [::]:80 default_server;
     return 301 https://$host$request_uri;
 }
 
 server {
-    listen 443 ssl http2 default_server;
+    listen [::]:443 ssl http2 default_server ipv6only=off;
-    listen [::]:443 ssl http2 default_server;
 
     add_header Strict-Transport-Security "max-age=31536000;";
 

ckan-datapusher.sh

@@ -18,6 +18,5 @@ rc-update add ckan-datapusher boot
 service ckan-datapusher start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/ckan-datapusher /etc/nginx/apps/ckan-datapusher
 cp ${SOURCE_DIR}/etc/nginx/conf.d/ckan-datapusher.conf /etc/nginx/conf.d/ckan-datapusher.conf
 service nginx reload

ckan-datapusher/etc/nginx/apps/ckan-datapusher

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/ckan-datapusher.access.log;
-error_log /var/log/nginx/ckan-datapusher.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9004;
-}

ckan-datapusher/etc/nginx/conf.d/ckan-datapusher.conf

@@ -1,5 +1,13 @@
 server {
-    listen 127.0.0.1:8004;
+    listen [::1]:8004 ipv6only=off;
-    listen [::1]:8004;
+
-    include apps/ckan-datapusher;
+    access_log /var/log/nginx/ckan-datapusher.access.log;
+    error_log /var/log/nginx/ckan-datapusher.error.log;
+
+    location / {
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9004;
+    }
 }

ckan.sh

@@ -48,7 +48,6 @@ rc-update add ckan boot
 service ckan start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/ckan /etc/nginx/apps/ckan
 cp ${SOURCE_DIR}/etc/nginx/conf.d/ckan.conf /etc/nginx/conf.d/ckan.conf
 service nginx reload
 

ckan/etc/nginx/apps/ckan

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/ckan.access.log;
-error_log /var/log/nginx/ckan.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9003;
-}

ckan/etc/nginx/conf.d/ckan.conf

@@ -1,11 +1,14 @@
 server {
-    listen 8003;
+    listen [::]:8003 ipv6only=off;
-    listen [::]:8003;
+    listen [::]:8403 ssl http2 ipv6only=off;
-    include apps/ckan;
-}
 
-server {
+    access_log /var/log/nginx/ckan.access.log;
-    listen 8403 ssl http2;
+    error_log /var/log/nginx/ckan.error.log;
-    listen [::]:8403 ssl http2;
+
-    include apps/ckan;
+    location / {
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9003;
+    }
 }

crisiscleanup.sh

@@ -36,7 +36,6 @@ rc-update add crisiscleanup boot
 service crisiscleanup start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/crisiscleanup /etc/nginx/apps/crisiscleanup
 cp ${SOURCE_DIR}/etc/nginx/conf.d/crisiscleanup.conf /etc/nginx/conf.d/crisiscleanup.conf
 service nginx reload
 

crisiscleanup/etc/nginx/apps/crisiscleanup

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/crisiscleanup.access.log;
-error_log /var/log/nginx/crisiscleanup.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9005;
-}

crisiscleanup/etc/nginx/conf.d/crisiscleanup.conf

@@ -1,11 +1,14 @@
 server {
-    listen 8005;
+    listen [::]:8005 ipv6only=off;
-    listen [::]:8005;
+    listen [::]:8405 ssl http2 ipv6only=off;
-    include apps/crisiscleanup;
+    
-}
+    access_log /var/log/nginx/crisiscleanup.access.log;
+    error_log /var/log/nginx/crisiscleanup.error.log;
 
-server {
+    location / {
-    listen 8405 ssl http2;
+        proxy_set_header X-Forwarded-For $remote_addr;
-    listen [::]:8405 ssl http2;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
-    include apps/crisiscleanup;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9005;
+    }
 }

cts.sh

@@ -40,7 +40,6 @@ rc-update add cts boot
 service cts start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/cts /etc/nginx/apps/cts
 cp ${SOURCE_DIR}/etc/nginx/conf.d/cts.conf /etc/nginx/conf.d/cts.conf
 service nginx reload
 

cts/etc/nginx/apps/cts

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/cts.access.log;
-error_log /var/log/nginx/cts.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9006;
-}

cts/etc/nginx/conf.d/cts.conf

@@ -1,11 +1,14 @@
 server {
-    listen 8006;
+    listen [::]:8006 ipv6only=off;
-    listen [::]:8006;
+    listen [::]:8406 ssl http2 ipv6only=off;
-    include apps/cts;
-}
 
-server {
+    access_log /var/log/nginx/cts.access.log;
-    listen 8406 ssl http2;
+    error_log /var/log/nginx/cts.error.log;
-    listen [::]:8406 ssl http2;
+
-    include apps/cts;
+    location / {
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9006;
+    }
 }

gnuhealth.sh

@@ -30,7 +30,6 @@ rc-update add gnuhealth boot
 service gnuhealth start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/gnuhealth /etc/nginx/apps/gnuhealth
 cp ${SOURCE_DIR}/etc/nginx/conf.d/gnuhealth.conf /etc/nginx/conf.d/gnuhealth.conf
 service nginx reload
 

gnuhealth/etc/nginx/apps/gnuhealth

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/gnuhealth.access.log;
-error_log /var/log/nginx/gnuhealth.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9008;
-}

gnuhealth/etc/nginx/conf.d/gnuhealth.conf

@@ -1,11 +1,14 @@
 server {
-    listen 8008;
+    listen [::]:8008 ipv6only=off;
-    listen [::]:8008;
+    listen [::]:8408 ssl http2 ipv6only=off;
-    include apps/gnuhealth;
-}
 
-server {
+    access_log /var/log/nginx/gnuhealth.access.log;
-    listen 8408 ssl http2;
+    error_log /var/log/nginx/gnuhealth.error.log;
-    listen [::]:8408 ssl http2;
+
-    include apps/gnuhealth;
+    location / {
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9008;
+    }
 }

kanboard.sh

@@ -26,7 +26,6 @@ rc-update add kanboard boot
 service kanboard start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/kanboard /etc/nginx/apps/kanboard
 cp ${SOURCE_DIR}/etc/nginx/conf.d/kanboard.conf /etc/nginx/conf.d/kanboard.conf
 service nginx reload
 

kanboard/etc/nginx/apps/kanboard

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/kanboard.access.log;
-error_log /var/log/nginx/kanboard.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9009;
-}

kanboard/etc/nginx/conf.d/kanboard.conf

@@ -1,11 +1,14 @@
 server {
-    listen 8009;
+    listen [::]:8009 ipv6only=off;
-    listen [::]:8009;
+    listen [::]:8409 ssl http2 ipv6only=off;
-    include apps/kanboard;
-}
 
-server {
+    access_log /var/log/nginx/kanboard.access.log;
-    listen 8409 ssl http2;
+    error_log /var/log/nginx/kanboard.error.log;
-    listen [::]:8409 ssl http2;
+
-    include apps/kanboard;
+    location / {
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9009;
+    }
 }

openmapkit.sh

@@ -19,7 +19,6 @@ rc-update add openmapkit boot
 service openmapkit start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/openmapkit /etc/nginx/apps/openmapkit
 cp ${SOURCE_DIR}/etc/nginx/conf.d/openmapkit.conf /etc/nginx/conf.d/openmapkit.conf
 service nginx reload
 

openmapkit/etc/nginx/apps/openmapkit

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/openmapkit.access.log;
-error_log /var/log/nginx/openmapkit.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9007;
-}

openmapkit/etc/nginx/conf.d/openmapkit.conf

@@ -1,11 +1,14 @@
 server {
-    listen 8007;
+    listen [::]:8007 ipv6only=off;
-    listen [::]:8007;
+    listen [::]:8407 ssl http2 ipv6only=off;
-    include apps/openmapkit;
-}
 
-server {
+    access_log /var/log/nginx/openmapkit.access.log;
-    listen 8407 ssl http2;
+    error_log /var/log/nginx/openmapkit.error.log;
-    listen [::]:8407 ssl http2;
+
-    include apps/openmapkit;
+    location / {
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9007;
+    }
 }

seeddms.sh

@@ -30,7 +30,6 @@ rc-update add seeddms boot
 service seeddms start
 
 # Create nginx app definition
-cp ${SOURCE_DIR}/etc/nginx/apps/seeddms /etc/nginx/apps/seeddms
 cp ${SOURCE_DIR}/etc/nginx/conf.d/seeddms.conf /etc/nginx/conf.d/seeddms.conf
 service nginx reload
 

seeddms/etc/nginx/apps/seeddms

@@ -1,9 +0,0 @@
-access_log /var/log/nginx/seeddms.access.log;
-error_log /var/log/nginx/seeddms.error.log;
-
-location / {
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Host $host:$server_port;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass http://127.0.0.1:9010;
-}

seeddms/etc/nginx/conf.d/seeddms.conf

@@ -1,11 +1,14 @@
 server {
-    listen 8010;
+    listen [::]:8010 ipv6only=off;
-    listen [::]:8010;
+    listen [::]:8410 ssl http2 ipv6only=off;
-    include apps/seeddms;
-}
 
-server {
+    access_log /var/log/nginx/seeddms.access.log;
-    listen 8410 ssl http2;
+    error_log /var/log/nginx/seeddms.error.log;
-    listen [::]:8410 ssl http2;
+
-    include apps/seeddms;
+    location / {
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:9010;
+    }
 }