5 files changed, 0 insertions, 97 deletions
diff --git a/services/config.template b/services/config.template
index fe44d66..e073844 100644
--- a/services/config.template
+++ b/services/config.template
@@ -5,7 +5,6 @@ CRUPEST_DOCKER_DIR=@@CRUPEST_SERVICES_DIR@@/docker
 CRUPEST_DATA_SECRET_DIR=@@CRUPEST_DATA_DIR@@/secret
 CRUPEST_DATA_CERTBOT_DIR=@@CRUPEST_DATA_DIR@@/certbot
 CRUPEST_DATA_GIT_DIR=@@CRUPEST_DATA_DIR@@/git
-CRUPEST_DATA_ROUNDCUBE_DIR=@@CRUPEST_DATA_DIR@@/roundcube
 CRUPEST_GENERATED_DIR=@@CRUPEST_SERVICES_DIR@@/generated
 CRUPEST_SSL_FULLCHAIN_FILE=@@CRUPEST_DATA_CERTBOT_DIR@@/certs/live/@@CRUPEST_DOMAIN@@/fullchain.pem
 CRUPEST_SSL_PRIVATE_KEY_FILE=@@CRUPEST_DATA_CERTBOT_DIR@@/certs/live/@@CRUPEST_DOMAIN@@/privkey.pem
diff --git a/services/docker/nginx/configs/templates/mail.conf.template b/services/docker/nginx/configs/templates/mail.conf.template
index 430033c..5f80654 100644
--- a/services/docker/nginx/configs/templates/mail.conf.template
+++ b/services/docker/nginx/configs/templates/mail.conf.template
@@ -1,24 +1,6 @@
 server {
     server_name mail.${CRUPEST_DOMAIN};
-    include common/https-listen;
-
-    location = /robots.txt {
-        root /srv/mail;
-    }
-
-    location / {
-        include common/proxy-common;
-        proxy_pass http://roundcubemail:80/;
-    }
-
-    client_max_body_size 5G;
-}
-
-
-server {
-    server_name mail.${CRUPEST_DOMAIN};
     include common/http-listen;
 
-    include common/https-redirect;
     include common/acme-challenge;
 }
diff --git a/services/templates/docker-compose.yaml.template b/services/templates/docker-compose.yaml.template
index 3410c97..a48d529 100644
--- a/services/templates/docker-compose.yaml.template
+++ b/services/templates/docker-compose.yaml.template
@@ -41,23 +41,6 @@ services:
         ipv4_address: "172.21.5.3"
     restart: on-failure:3
 
-  roundcubemail:
-    image: "roundcube/roundcubemail"
-    pull_policy: always
-    hostname: roundcubemail
-    env_file:
-      - "./@@CRUPEST_GENERATED_DIR@@/envs/roundcubemail.env"
-    volumes:
-      - "./@@CRUPEST_DATA_SECRET_DIR@@/gnupg:/var/roundcube/enigma"
-      - "./@@CRUPEST_DATA_ROUNDCUBE_DIR@@/www/html:/var/www/html"
-      - "./@@CRUPEST_DATA_ROUNDCUBE_DIR@@/db:/var/roundcube/db"
-      - "./@@CRUPEST_GENERATED_DIR@@/roundcube.inc.php:/var/roundcube/config"
-      - "roundcubemail-temp:/tmp/roundcube-temp"
-    networks:
-      default:
-        ipv4_address: "172.21.5.4"
-    restart: on-failure:3
-
   v2ray:
     pull_policy: build
     build:
@@ -86,9 +69,6 @@ services:
       - "./data/auto-backup:/data/auto-backup"
     restart: "on-failure:3"
 
-volumes:
-  roundcubemail-temp:
-
 networks:
   default:
     enable_ipv6: false
diff --git a/services/templates/envs/roundcubemail.env.template b/services/templates/envs/roundcubemail.env.template
deleted file mode 100644
index f8a04ff..0000000
--- a/services/templates/envs/roundcubemail.env.template
+++ /dev/null
@@ -1,2 +0,0 @@
-ROUNDCUBEMAIL_DB_TYPE=sqlite
-ROUNDCUBEMAIL_PLUGINS=archive,enigma,jqueryui,newmail_notifier,show_additional_headers,userinfo,zipdownload
diff --git a/services/templates/roundcube.inc.php.template b/services/templates/roundcube.inc.php.template
deleted file mode 100644
index 70b0aff..0000000
--- a/services/templates/roundcube.inc.php.template
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-// tell PHP that it should work as under secure connection
-// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set)
-// e.g. when you're running Roundcube behind a https proxy
-// this option is mutually exclusive to 'force_https' and only either one of them should be set to true.
-$config['use_https'] = true;
-
-// The IMAP host (and optionally port number) chosen to perform the log-in.
-// Leave blank to show a textbox at login, give a list of hosts
-// to display a pulldown menu or set one host as string.
-// Enter hostname with prefix ssl:// to use Implicit TLS, or tls:// for STARTTLS.
-// If port number is omitted it will be set to 993 (for ssl://) or 143 otherwise.
-// Supported replacement variables:
-// %n - hostname ($_SERVER['SERVER_NAME'])
-// %t - hostname without the first part
-// %d - domain (http hostname, $_SERVER['HTTP_HOST'] without the first part)
-// %s - domain name after the '@' from e-mail address provided at login screen
-// For example %n = mail.domain.tld, %t = domain.tld
-// WARNING: After hostname change update of mail_host column in users table is
-//          required to match old user data records with the new host.
-$config['imap_host'] = 'ssl://outlook.office365.com:993';
-
-// SMTP server host (and optional port number) for sending mails.
-// Enter hostname with prefix ssl:// to use Implicit TLS, or tls:// for STARTTLS.
-// If port number is omitted it will be set to 465 (for ssl://) or 587 otherwise.
-// Supported replacement variables:
-// %h - user's IMAP hostname
-// %n - hostname ($_SERVER['SERVER_NAME'])
-// %t - hostname without the first part
-// %d - domain (http hostname, $_SERVER['HTTP_HOST'] without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %t = domain.tld
-// To specify different SMTP servers for different IMAP hosts provide an array
-// of IMAP host (no prefix or port) and SMTP server e.g. ['imap.example.com' => 'smtp.example.net']
-$config['smtp_host'] = 'tls://smtp-mail.outlook.com:587';
-
-// Register your OAuth client at https://portal.azure.com
-// - use https://<your-roundcube-url>/index.php/login/oauth as redirect URL
-// - grant permissions to Microsoft Graph API "IMAP.AccessAsUser.All", "SMTP.Send", "User.Read" and "offline_access"
-
-$config['oauth_provider'] = 'outlook';
-$config['oauth_provider_name'] = 'Outlook.com';
-$config['oauth_client_id'] = "@@CRUPEST_ROUNDCUBE_OAUTH_CLIENT_ID@@";
-$config['oauth_client_secret'] = "@@CRUPEST_ROUNDCUBE_OAUTH_CLIENT_SECRET@@";
-$config['oauth_auth_uri'] = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize";
-$config['oauth_token_uri'] = "https://login.microsoftonline.com/common/oauth2/v2.0/token";
-$config['oauth_identity_uri'] = "https://graph.microsoft.com/v1.0/me";
-$config['oauth_identity_fields'] = ['email', 'userPrincipalName'];
-$config['oauth_scope'] = "https://outlook.office365.com/IMAP.AccessAsUser.All https://outlook.office365.com/SMTP.Send User.Read offline_access";
-$config['oauth_auth_parameters'] = ['nonce' => mt_rand()];
-
-// Logon username filter. Regular expression for use with preg_match().
-// Use special value 'email' if you accept only full email addresses as user logins.
-// Example: '/^[a-z0-9_@.-]+$/'
-$config['login_username_filter'] = '@@CRUPEST_EMAIL@@';