Fixed HTTPS reboot issue not persisting in roundcube

fstack/lib/mail.sh

@@ -15,13 +15,14 @@ config_mail() {
     mkdir -p fstack/mail/data/var/mail-state &> /dev/null
     mkdir -p fstack/mail/data/var/log/mail &> /dev/null
     mkdir -p fstack/mail/data/tmp/docker-mailserver &> /dev/null
+    mkdir -p fstack/mail/data/etc/apache2/sites-available &> /dev/null
     mkdir -p fstack/mail/data/etc/apache2/sites-enabled &> /dev/null
     cp -rf fstack/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem fstack/mail/data/root/certs/
   fi
 
-#  DOMAIN_ARRAY=(${DOMAIN//./ })
+  DOMAIN_ARRAY=(${DOMAIN//./ })
-#  DOMAIN_FIRST=${DOMAIN_ARRAY[0]}
+  DOMAIN_FIRST=${DOMAIN_ARRAY[0]}
-#  DOMAIN_LAST=${DOMAIN_ARRAY[1]}
+  DOMAIN_LAST=${DOMAIN_ARRAY[1]}
 
 cat > fstack/mail/docker-compose.yml <<EOF
 version: '3.8'
@@ -51,9 +52,10 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - ENABLE_SPAMASSASSIN=1
+      - ENABLE_SPAMASSASSIN_KAM=1
       - SPAMASSASSIN_SPAM_TO_INBOX=1
       - ENABLE_CLAMAV=0
-      - ENABLE_FAIL2BAN=0
+      - ENABLE_FAIL2BAN=1
       - ENABLE_POSTGREY=1
       - ONE_DIR=1
       - DMS_DEBUG=0
@@ -105,9 +107,13 @@ services:
       - 9443:443
     volumes:
       - ./data/root/certs:/root/certs
-      - ./data/etc/apache2/sites-enabled:/etc/apache2/sites-enabled
+      - ./data/etc/apache2/sites-available:/etc/apache2/sites-available
       - ./data/var/roundcube:/var/roundcube
     environment:
+      - CERT_NAME=$DOMAIN
+      - VIRTUAL_PROTO=https
+      - VIRTUAL_PORT=443
+      - VIRTUAL_HOST=webmail.$DOMAIN
       - ROUNDCUBEMAIL_DEFAULT_HOST=tls://mail.$DOMAIN
       - ROUNDCUBEMAIL_SMTP_SERVER=tls://mail.$DOMAIN
       - ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE=4096M
@@ -119,8 +125,10 @@ networks:
     external: true
 EOF
 
-cat > fstack/mail/data/etc/apache2/sites-enabled/000-default.conf <<'EOF'
+cat > fstack/mail/data/etc/apache2/sites-available/000-default.conf <<'EOF'
+LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
 LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
+Listen 443
 
 <VirtualHost *:80>
  ServerAdmin admin@localhost
@@ -139,6 +147,35 @@ LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
  ErrorLog ${APACHE_LOG_DIR}/error.log
  CustomLog ${APACHE_LOG_DIR}/access.log combined
 </VirtualHost>
+EOF
+
+cat > fstack/mail/data/etc/apache2/sites-enabled/000-default.conf <<'EOF'
+LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
+LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
+Listen 443
+
+<VirtualHost *:80>
+ ServerAdmin admin@localhost
+ DocumentRoot /var/www/html
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
+
+<VirtualHost *:443>
+ SSLEngine on
+ SSLCertificateFile /root/certs/fullchain1.pem
+ SSLCertificateKeyFile /root/certs/privkey1.pem
+
+ ServerAdmin admin@localhost
+ DocumentRoot /var/www/html
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
+EOF
+
+cat > fstack/mail/data/tmp/docker-mailserver/postfix-main.cf <<'EOF'
+smtpd_sender_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_unknown_sender_domain, reject_sender_login_mismatch
+smtpd_sender_login_maps = ldap:/etc/postfix/ldap-aliases.cf
 EOF
 
   kill -9 $SPINPID &> /dev/null
@@ -195,11 +232,14 @@ start_mail() {
   docker exec -it dns rndc reload &> /dev/null
   [ $? -ne 0 ] && fail "Couldn't run rndc reload on fstack/dns container"
 
-  # Enable SSL module in fstack/webmail
+  # Enable SSL moduel in webmail container
-  docker exec -it webmail a2enmod ssl &> /dev/null
+#  docker exec -it webmail a2enmod ssl &> /dev/null
-  [ $? -ne 0 ] && fail "Couldn't run a2enmod ssl in fstack/webmail container"
+#  [ $? -ne 0 ] && fail "Couldn't run a2enmod ssl in fstack/webmail container"
 
-  docker exec -it webmail service apache2 restart &> /dev/null
+#  docker exec -it webmail a2enmod socache_shmcb &> /dev/null
+#  [ $? -ne 0 ] && fail "Couldn't run a2enmod socache_shmcb in fstack/webmail container"
+
+#  docker exec -it webmail service apache2 reload &> /dev/null
   
   kill -9 $SPINPID &> /dev/null
   echo -ne "done."