docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
kaiyou
2017-09-10 12:17:52 +02:00
parent b245e520ba 22e7ee9dbe
commit 609524356c
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nginx/Dockerfile
View File

@@ -1,6 +1,6 @@
FROM nginx:alpine 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.default /etc/nginx/nginx.conf.default
COPY nginx.conf.fallback /etc/nginx/nginx.conf.fallback COPY nginx.conf.fallback /etc/nginx/nginx.conf.fallback

2
nginx/nginx.conf.default
View File

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

2
nginx/nginx.conf.fallback
View File

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

5
nginx/start.sh
View File

@@ -1,11 +1,10 @@
#!/bin/sh #!/bin/sh
if [[ -z ENABLE_CERTBOT || -f /certs/cert.pem ]] if [ -z ENABLE_CERTBOT ] || [ -f /certs/cert.pem ]
then then
cp /etc/nginx/nginx.conf.default /etc/nginx/nginx.conf cp /etc/nginx/nginx.conf.default /etc/nginx/nginx.conf
else 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 cp /etc/nginx/nginx.conf.fallback /etc/nginx/nginx.conf
fi fi