fix(roundcubemail): fix reverse prpxy.

3 files changed, 9 insertions, 41 deletions

diff --git a/template/docker-compose.yaml.template b/template/docker-compose.yaml.template
index 6dbc2b9..f64543b 100644
--- a/template/docker-compose.yaml.template
+++ b/template/docker-compose.yaml.template
@@ -42,7 +42,6 @@ services:
       - "./data/certbot/certs:/etc/letsencrypt:ro"
       - "./data/certbot/webroot:/srv/acme:ro"
       - "blog-public:/srv/blog:ro"
-      - "roundcubemail-www:/srv/roundcubemail:ro"
 
   crupest-api:
     pull_policy: build
@@ -182,12 +181,9 @@ services:
     container_name: roundcubemail
     restart: on-failure:3
     volumes:
-      - roundcubemail-www:/var/www/html
       - ./data/roundcube/config:/var/roundcube/config
       - ./data/roundcube/db:/var/roundcube/db
       - rountcubemail-temp:/tmp/roundcube-temp
-    ports:
-      - 9002:80
     environment:
       - ROUNDCUBEMAIL_DEFAULT_HOST=ssl://mail.crupest.life
       - ROUNDCUBEMAIL_DEFAULT_PORT=993
@@ -198,5 +194,4 @@ services:
 volumes:
   blog-public:
   debian-dev-home:
-  roundcubemail-www:
   rountcubemail-temp:
\ No newline at end of file
diff --git a/template/nginx/root.conf.template b/template/nginx/root.conf.template
index 1a32b6d..8f65b40 100644
--- a/template/nginx/root.conf.template
+++ b/template/nginx/root.conf.template
@@ -49,39 +49,3 @@ server {
         root /srv/acme;
     }
 }
-
-# Temporary config for roundcubemail (PHP)
-# TODO: Add to nginx template.
-
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name mail.${CRUPEST_DOMAIN};
-
-    index index.php index.html;
-    root /srv/roundcubemail;
-
-    location ~ \.php$ {
-        try_files $uri =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass roundcubemail:9009;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-    }
-}
-
-server {
-    listen 80;
-    listen [::]:80;
-    server_name mail.${CRUPEST_DOMAIN};
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-
-    location /.well-known/acme-challenge {
-        root /srv/acme;
-    }
-}
diff --git a/template/nginx/server.json b/template/nginx/server.json
index a338c4f..183bd77 100644
--- a/template/nginx/server.json
+++ b/template/nginx/server.json
@@ -17,6 +17,11 @@
             "upstream": "forgejo:3000"
         },
         {
+            "type": "reverse-proxy",
+            "subdomain": "mail",
+            "upstream": "roundcubemail:80"
+        },
+        {
             "type": "static-file",
             "subdomain": "blog",
             "root": "/srv/blog"
@@ -25,6 +30,10 @@
             "type": "redirect",
             "subdomain": "github",
             "url": "https://github.com/crupest"
+        },
+        {
+            "type": "cert-only",
+            "subdomain": "mail"
         }
     ]
 }