From c8fe500d18cdae728e5cf897b72881a5460998f1 Mon Sep 17 00:00:00 2001
From: Lieuwe Leene <lieuwe@leene.dev>
Date: Sun, 13 Nov 2022 10:19:12 +0100
Subject: [PATCH] WIP

---
 config/nginx/git.zathura.leene.dev_location   |  9 ---------
 config/nginx/inbox.zathura.leene.dev_location |  5 ++---
 docker-compose.yaml                           | 16 +++++++++-------
 3 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 config/nginx/git.zathura.leene.dev_location

diff --git a/config/nginx/git.zathura.leene.dev_location b/config/nginx/git.zathura.leene.dev_location
deleted file mode 100644
index e193fd2..0000000
--- a/config/nginx/git.zathura.leene.dev_location
+++ /dev/null
@@ -1,9 +0,0 @@
-
-location / {
-    proxy_pass git.zathura.leene.dev;
-    proxy_redirect off;
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-}
diff --git a/config/nginx/inbox.zathura.leene.dev_location b/config/nginx/inbox.zathura.leene.dev_location
index 7cbfe2e..4262324 100644
--- a/config/nginx/inbox.zathura.leene.dev_location
+++ b/config/nginx/inbox.zathura.leene.dev_location
@@ -1,7 +1,6 @@
 
-root  /var/www/html/roundcubemail;
+root  /var/www/html/roundcube;
 index  index.php index.html index.htm;
-client_max_body_size 128M;
 
 location / {
     try_files $uri $uri/ /index.php?q=$uri&$args;
@@ -11,8 +10,8 @@ location ~ \.php$ {
     try_files $uri =404;
     fastcgi_keep_conn on;
     fastcgi_split_path_info ^(.+\.php)(.*)$;
-    fastcgi_pass zathura.leene.dev;
     fastcgi_index index.php;
+    fastcgi_pass inbox.zathura.leene.dev;
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     include fastcgi_params;
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5585a5f..8693f41 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -34,7 +34,7 @@ services:
     environment:
       - VIRTUAL_HOST=git.zathura.leene.dev
       - VIRTUAL_PORT=3000
-      - LETSENCRYPT_HOST=zathura.leene.dev
+      - LETSENCRYPT_HOST=git.zathura.leene.dev
       - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
     volumes:
       - gitea_data:/data:z
@@ -57,7 +57,7 @@ services:
       - ROUNDCUBEMAIL_DB_HOST=pgsqlserver
       - VIRTUAL_HOST=inbox.zathura.leene.dev
       - VIRTUAL_PORT=9000
-      - LETSENCRYPT_HOST=zathura.leene.dev
+      - LETSENCRYPT_HOST=inbox.zathura.leene.dev
       - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
     depends_on:
       - pgsqlserver
@@ -66,14 +66,14 @@ services:
     expose:
       - "9000"
     volumes:
-      - nginx_html/roundcubemail:/var/www/html
+      - mail_html:/var/www/html:z
 
   mailserver:
     build: ./config/mail
     <<: *defaults
     image: mailserver/docker-mailserver:latest
     container_name: mailserver
-    hostname: mail
+    hostname: inbox
     domainname: zathura.leene.dev
     ports:
       - "25:25"
@@ -81,7 +81,7 @@ services:
       - "587:587"
       - "993:993"
     volumes:
-      - nginx_certs:/etc/letsencrypt/live/
+      - nginx_certs:/etc/letsencrypt/live:ro
       - mail_data:/var/mail/:z
       - mail_state:/var/mail-state/:z
       - mail_config:/tmp/docker-mailserver/:z
@@ -106,7 +106,8 @@ services:
       - nginx_conf:/etc/nginx/conf.d/:z
       - nginx_vhost:/etc/nginx/vhost.d/:z
       - nginx_html:/usr/share/nginx/html/:z
-      - ./config/nginx/zathura.leene.dev_location:/etc/nginx/vhost.d/zathura.leene.dev_location:ro
+      - mail_html:/var/www/html/roundcube:z
+      - ./config/nginx/inbox.zathura.leene.dev_location:/etc/nginx/vhost.d/inbox.zathura.leene.dev_location:z
       - /var/run/docker.sock:/tmp/docker.sock:z
     depends_on:
       - ddnsgd
@@ -129,7 +130,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:z
     depends_on:
       - ddnsgd
-    build: ./config/nginx
+
 
 volumes:
   acme-state:
@@ -142,4 +143,5 @@ volumes:
   mail_data:
   mail_config:
   mail_state:
+  mail_html:
   sql_data: