From 5328d5fe5c13f9fe5eac5a96d95263472c42c79a Mon Sep 17 00:00:00 2001
From: root <root@dytest.federated.company>
Date: Thu, 3 Nov 2022 12:53:17 +0000
Subject: [PATCH] Took out roundcube / webmail

---
 fstack/lib/mail.sh | 86 ----------------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/fstack/lib/mail.sh b/fstack/lib/mail.sh
index c9e3737..ff92c53 100644
--- a/fstack/lib/mail.sh
+++ b/fstack/lib/mail.sh
@@ -15,8 +15,6 @@ 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
 
@@ -93,86 +91,11 @@ services:
       - NET_ADMIN
       - SYS_PTRACE
 
-  webmail:
-    image: roundcube/roundcubemail:latest
-    container_name: webmail
-    hostname: webmail.$DOMAIN
-    domainname: $DOMAIN
-    restart: always
-    networks:
-      fstack:
-        ipv4_address: 172.99.0.14
-    ports:
-      - 9002:80
-      - 9443:443
-    volumes:
-      - ./data/root/certs:/root/certs
-      - ./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
-    depends_on:
-      - mail
-
 networks:
   fstack:
     external: true
 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
- 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/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
@@ -232,15 +155,6 @@ start_mail() {
   docker exec -it dns rndc reload &> /dev/null
   [ $? -ne 0 ] && fail "Couldn't run rndc reload on fstack/dns container"
 
-  # Enable SSL moduel in webmail container
-#  docker exec -it webmail a2enmod ssl &> /dev/null
-#  [ $? -ne 0 ] && fail "Couldn't run a2enmod ssl in fstack/webmail container"
-
-#  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."
 }