Browse Source

Remove 'ssl' directive; use 'listen ... ssl;' instead

dennisro 6 years ago
parent
commit
880263e251

+ 1 - 2
data/services/bitbucket/nginx/bitbucket.conf

@@ -15,9 +15,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/cryptpad/nginx/cryptpad.conf

@@ -30,9 +30,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/cs50ide/nginx/cs50ide.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/dillinger/nginx/dillinger.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/ghost/nginx/ghost.conf

@@ -9,9 +9,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/gitea/nginx/gitea.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/gitlabce/nginx/gitlabce.conf

@@ -15,9 +15,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/gogs/nginx/gogs.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/hastebin/nginx/hastebin.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/kanboard/nginx/kanboard.conf

@@ -33,9 +33,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/mailcowdockerized/nginx/mailcowdockerized.conf

@@ -30,9 +30,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
     server_name ${SERVICE_DOMAIN} autodiscover.${DOMAIN} autoconfig.${DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/mailpile/nginx/mailpile.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/mastodon/nginx/mastodon.conf

@@ -34,9 +34,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/nextcloud/nginx/nextcloud.conf

@@ -30,9 +30,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/openproject/nginx/openproject.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/padlockcloud/nginx/padlockcloud.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/piwik/nginx/piwik.conf

@@ -18,9 +18,8 @@ server {
 
 server {
 
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/seafilepro/nginx/seafilepro.conf

@@ -39,9 +39,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/searx/nginx/searx.conf

@@ -15,9 +15,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/send/nginx/send.conf

@@ -24,9 +24,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/sftpserver/nginx/sftpserver.conf

@@ -20,9 +20,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 0 - 1
data/services/statichtmlsite/nginx/statichtmlsite.conf

@@ -26,7 +26,6 @@ server {
         index index.html index.htm;
 	listen 443 ssl;
 #	listen [::]:443 ipv6only=on  ssl;
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/wekan/nginx/wekan.conf

@@ -20,9 +20,8 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-    ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;

+ 1 - 2
data/services/wordpress/nginx/wordpress.conf

@@ -39,9 +39,8 @@ server {
 }
 
 server {
-	listen 443;
+	listen 443 ssl;
 	server_name ${SERVICE_DOMAIN};
-	ssl on;
 	ssl_certificate /etc/nginx/ssl/${SERVICE_DOMAIN}/cert.pem;
 	ssl_certificate_key /etc/nginx/ssl/${SERVICE_DOMAIN}/key.pem;
 	include /etc/nginx/includes/ssl.conf;