Merge remote-tracking branch 'origin/stable' into 1.4

nginx/Dockerfile

@@ -1,6 +1,6 @@
 FROM nginx:alpine
 
-RUN apk add --no-cache nginx-lua openssl
+RUN apk add --no-cache nginx-mod-http-lua openssl
 
 COPY nginx.conf.default /etc/nginx/nginx.conf.default
 COPY nginx.conf.fallback /etc/nginx/nginx.conf.fallback

nginx/nginx.conf.default

@@ -3,6 +3,8 @@ user nginx;
 worker_processes  1;
 error_log /dev/stderr info;
 pid /var/run/nginx.pid;
+include /etc/nginx/modules/devel_kit.conf;
+include /etc/nginx/modules/http_lua.conf;
 
 events {
     worker_connections  1024;

nginx/nginx.conf.fallback

@@ -3,6 +3,8 @@ user nginx;
 worker_processes  1;
 error_log /dev/stderr info;
 pid /var/run/nginx.pid;
+include /etc/nginx/modules/devel_kit.conf;
+include /etc/nginx/modules/http_lua.conf;
 
 events {
     worker_connections  1024;

nginx/start.sh

@@ -1,11 +1,10 @@
 #!/bin/sh
 
-if [[ -z ENABLE_CERTBOT || -f /certs/cert.pem ]]
+if [ -z ENABLE_CERTBOT ] || [ -f /certs/cert.pem ]
 then
   cp /etc/nginx/nginx.conf.default /etc/nginx/nginx.conf
 else
-  openssl req -newkey rsa:2048 -x509 -keyout /tmp/snakeoil.pem -out /tmp/snakeoil.pem -days 365 -nodes -subj "/C=NA/ST=None/
+  openssl req -newkey rsa:2048 -x509 -keyout /tmp/snakeoil.pem -out /tmp/snakeoil.pem -days 365 -nodes -subj "/C=NA/ST=None/L=None/O=None/CN=$DOMAIN"
-L=None/O=None/CN=$DOMAIN"
   cp /etc/nginx/nginx.conf.fallback /etc/nginx/nginx.conf
 fi