From b7e3a64d2a5290b18ff98ef20ac82f7c55f5fa58 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Sun, 29 Jun 2025 23:58:11 +0800 Subject: mail: remove roundcube. --- dictionary.txt | 2 - services/config.template | 1 - .../nginx/configs/templates/mail.conf.template | 18 ------- services/templates/docker-compose.yaml.template | 20 -------- services/templates/envs/roundcubemail.env.template | 2 - services/templates/roundcube.inc.php.template | 56 ---------------------- 6 files changed, 99 deletions(-) delete mode 100644 services/templates/envs/roundcubemail.env.template delete mode 100644 services/templates/roundcube.inc.php.template diff --git a/dictionary.txt b/dictionary.txt index 8df3201..b0b2b2b 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -10,8 +10,6 @@ esmtp healthcheck certbot -roundcube -roundcubemail gerrit gohugoio pwsh 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 @@ - 'smtp.example.net'] -$config['smtp_host'] = 'tls://smtp-mail.outlook.com:587'; - -// Register your OAuth client at https://portal.azure.com -// - use https:///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@@'; -- cgit v1.2.3