Some changes

master
andryyy 2016-12-09 21:10:11 +01:00
parent 1715a7a871
commit e9b97e98ec
6 changed files with 13 additions and 3 deletions

4
.gitignore vendored
View File

@ -3,3 +3,7 @@ data/db/mysql/*
data/db/redis/* data/db/redis/*
!data/db/redis/.redis_data !data/db/redis/.redis_data
data/vmail/* data/vmail/*
data/dkim/keys/*
!data/dkim/keys/.dkim_priv_keys
data/dkim/txt/*
!data/dkim/txt/.dkim_pub_keys

View File

@ -22,11 +22,13 @@ fi
sed -i "s#database_name.*#database_name = \"${DBNAME}\";#" data/web/inc/vars.inc.php sed -i "s#database_name.*#database_name = \"${DBNAME}\";#" data/web/inc/vars.inc.php
sed -i "s#database_user.*#database_user = \"${DBUSER}\";#" data/web/inc/vars.inc.php sed -i "s#database_user.*#database_user = \"${DBUSER}\";#" data/web/inc/vars.inc.php
sed -i "s#database_pass.*#database_pass = \"${DBPASS}\";#" data/web/inc/vars.inc.php sed -i "s#database_pass.*#database_pass = \"${DBPASS}\";#" data/web/inc/vars.inc.php
sed -i "s#database_user.*#database_user = \"${DBUSER}\";#" data/conf/nginx/vars.inc.php
docker run \ docker run \
-d -p ${HTTP_PORT}:80 \ -p 443:443 \
--name ${NAME} \ --name ${NAME} \
-v ${PWD}/data/web:/web:ro \ -v ${PWD}/data/web:/web:ro \
-v ${PWD}/data/assets/ssl/:/etc/ssl/mail/:ro \
-v ${PWD}/data/conf/nginx/:/etc/nginx/conf.d/:ro \ -v ${PWD}/data/conf/nginx/:/etc/nginx/conf.d/:ro \
--network=${DOCKER_NETWORK} \ --network=${DOCKER_NETWORK} \
--network-alias nginx \ --network-alias nginx \

View File

@ -1,4 +1,8 @@
server { server {
listen 443;
ssl on;
ssl_certificate /etc/ssl/mail/mail.crt;
ssl_certificate_key /etc/ssl/mail/mail.key;
index index.php index.html; index index.php index.html;
server_name _; server_name _;
error_log /var/log/nginx/error.log; error_log /var/log/nginx/error.log;

View File

View File

View File

@ -18,13 +18,13 @@ DBVERS=5.5
SOGOCHILDS=20 SOGOCHILDS=20
# Webserver configuration # Webserver configuration
HTTP_PORT=81 # Default port binding for Nginx is 443
PHPVERS="5.6-fpm" PHPVERS="5.6-fpm"
NGINXVERS="stable" NGINXVERS="stable"
# You should leave that alone # You should leave that alone
# Can also be 1.2.3.4:25 for specific binding # Can also be 1.2.3.4:25 for specific binding
SMTP_PORT=26 SMTP_PORT=25
SMTPS_PORT=465 SMTPS_PORT=465
SUBMISSION_PORT=587 SUBMISSION_PORT=587
IMAP_PORT=143 IMAP_PORT=143