From d75cbb6fdbbe34c42cd384ad5450d2a51d9faaf5 Mon Sep 17 00:00:00 2001
From: Lieuwe Leene <lieuwe@leene.dev>
Date: Sun, 13 Nov 2022 09:29:11 +0100
Subject: [PATCH] WIP: progress build

---
 TODO.md                                       |  9 ++++++
 config/nginx/git.zathura.leene.dev_location   |  9 ++++++
 ...ation => inbox.zathura.leene.dev_location} |  0
 docker-compose.yaml                           | 32 +++++++++++++++++--
 local.env                                     |  2 --
 5 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 TODO.md
 create mode 100644 config/nginx/git.zathura.leene.dev_location
 rename config/nginx/{zathura.leene.dev_location => inbox.zathura.leene.dev_location} (100%)

diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..f361f7a
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,9 @@
+# Startup
+
+ - Update accounts
+ - Update dkim
+
+# Compose
+
+ - Include Hugo in build
+ - Include nextcloud in build
diff --git a/config/nginx/git.zathura.leene.dev_location b/config/nginx/git.zathura.leene.dev_location
new file mode 100644
index 0000000..e193fd2
--- /dev/null
+++ b/config/nginx/git.zathura.leene.dev_location
@@ -0,0 +1,9 @@
+
+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/zathura.leene.dev_location b/config/nginx/inbox.zathura.leene.dev_location
similarity index 100%
rename from config/nginx/zathura.leene.dev_location
rename to config/nginx/inbox.zathura.leene.dev_location
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a071f8f..5585a5f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,6 +17,8 @@ services:
     <<: *defaults
     container_name: pgsqlserver
     image: postgres:15
+    environment:
+      - POSTGRES_MULTIPLE_DATABASES="gitea, roundcube"
     volumes:
       - sql_data:/var/lib/postgresql/data/:z
       - ./config/pg-init-scripts:/docker-entrypoint-initdb.d:ro
@@ -24,13 +26,37 @@ services:
     expose:
       - "5432"
 
+  gitea:
+    <<: *defaults
+    container_name: gitea
+    image: gitea/gitea
+    restart: always
+    environment:
+      - VIRTUAL_HOST=git.zathura.leene.dev
+      - VIRTUAL_PORT=3000
+      - LETSENCRYPT_HOST=zathura.leene.dev
+      - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
+    volumes:
+      - gitea_data:/data:z
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    expose:
+      - "3000"
+    ports:
+      - "222:22"
+    depends_on:
+      - pgsqlserver
+    links:
+      - pgsqlserver
+
   roundcubemail:
     <<: *defaults
     image: roundcube/roundcubemail:latest-fpm
     container_name: roundcubemail
     environment:
       - ROUNDCUBEMAIL_DB_HOST=pgsqlserver
-      - VIRTUAL_HOST=zathura.leene.dev
+      - VIRTUAL_HOST=inbox.zathura.leene.dev
+      - VIRTUAL_PORT=9000
       - LETSENCRYPT_HOST=zathura.leene.dev
       - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
     depends_on:
@@ -66,7 +92,6 @@ services:
       - ddnsgd
     restart: always
 
-
   reverse-proxy:
     <<: *defaults
     image: nginxproxy/nginx-proxy
@@ -107,8 +132,8 @@ services:
     build: ./config/nginx
 
 volumes:
-  sql_data:
   acme-state:
+  gitea_data:
   nginx_certs:
   nginx_dhparam:
   nginx_html:
@@ -117,3 +142,4 @@ volumes:
   mail_data:
   mail_config:
   mail_state:
+  sql_data:
diff --git a/local.env b/local.env
index f86934d..70680d2 100644
--- a/local.env
+++ b/local.env
@@ -32,12 +32,10 @@ ENABLE_UPDATE_CHECK=1
 
 SSL_TYPE=letsencrypt
 
-
 ## SQL Server Env
 
 POSTGRES_USER="pgadmin"
 POSTGRES_INITDB_ARGS="--auth-host=scram-sha-256 --auth-local=scram-sha-256"
-POSTGRES_MULTIPLE_DATABASES="gitea, roundcube"
 
 ## Round Cube Env