Merge branch 'master' into admin-login

2019-03-18 02:03:59 +01:00
parent ae19d81f2d d8e356f590
commit 3d8a46357b
16 changed files with 123 additions and 112 deletions
--- a/generate_config.sh
+++ b/generate_config.sh
@@ -16,6 +16,7 @@ if [ -f mailcow.conf ]; then
  case $response in
    [yY][eE][sS]|[yY])
      mv mailcow.conf mailcow.conf_backup
+      chmod 600 mailcow.conf_backup
      ;;
    *)
      exit 1
@@ -241,5 +242,7 @@ EOF

 mkdir -p data/assets/ssl

+chmod 600 mailcow.conf
+
 # copy but don't overwrite existing certificate
 cp -n data/assets/ssl-example/*.pem data/assets/ssl/