road to v1.2.1

confs/global/multisite-default-server-https.conf

@@ -8,3 +8,4 @@ ssl_session_timeout 1d;
 ssl_session_cache shared:MozSSL:10m;
 %SSL_DHPARAM%
 %SSL_CIPHERS%
+%LETS_ENCRYPT_WEBROOT%

confs/global/multisite-default-server-lets-encrypt-webroot.conf

@@ -0,0 +1,3 @@
+location ~ ^/.well-known/acme-challenge/ {
+	root /acme-challenge;
+}

confs/global/multisite-default-server.conf

@@ -0,0 +1,6 @@
+server {
+	%LISTEN_HTTP%
+	server_name _;
+	%USE_HTTPS%
+	%MULTISITE_DISABLE_DEFAULT_SERVER%
+}

confs/global/multisite-disable-default-server.conf

@@ -1,6 +1,3 @@
-server {
-	%LISTEN_HTTP%
-	%USE_HTTPS%
-	server_name _;
+location / {
 	return 444;
 }

confs/global/nginx-temp.conf

@@ -0,0 +1,20 @@
+daemon on;
+pid /tmp/nginx.pid;
+
+events {
+        worker_connections 1024;
+        use epoll;
+}
+
+http {
+	server {
+		listen 0.0.0.0:%HTTP_PORT% default_server;
+		server_name _;
+		location ~ ^/.well-known/acme-challenge/ {
+			root /acme-challenge;
+		}
+		location / {
+			return 444;
+		}
+	}
+}

confs/global/nginx.conf

@@ -100,8 +100,8 @@ http {
 	# custom http confs
 	include /http-confs/*.conf;
 
-	# disable default server when MULTISITE=yes
-	%MULTISITE_DISABLE_DEFAULT_SERVER%
+	# default server when MULTISITE=yes
+	%MULTISITE_DEFAULT_SERVER%
 
 	# server config(s)
 	%INCLUDE_SERVER%