WIP: progress build

This commit is contained in:
Lieuwe Leene 2022-11-13 09:29:11 +01:00
parent dde53d3452
commit d75cbb6fdb
5 changed files with 47 additions and 5 deletions

9
TODO.md Normal file
View File

@ -0,0 +1,9 @@
# Startup
- Update accounts
- Update dkim
# Compose
- Include Hugo in build
- Include nextcloud in build

View File

@ -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;
}

View File

@ -17,6 +17,8 @@ services:
<<: *defaults <<: *defaults
container_name: pgsqlserver container_name: pgsqlserver
image: postgres:15 image: postgres:15
environment:
- POSTGRES_MULTIPLE_DATABASES="gitea, roundcube"
volumes: volumes:
- sql_data:/var/lib/postgresql/data/:z - sql_data:/var/lib/postgresql/data/:z
- ./config/pg-init-scripts:/docker-entrypoint-initdb.d:ro - ./config/pg-init-scripts:/docker-entrypoint-initdb.d:ro
@ -24,13 +26,37 @@ services:
expose: expose:
- "5432" - "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: roundcubemail:
<<: *defaults <<: *defaults
image: roundcube/roundcubemail:latest-fpm image: roundcube/roundcubemail:latest-fpm
container_name: roundcubemail container_name: roundcubemail
environment: environment:
- ROUNDCUBEMAIL_DB_HOST=pgsqlserver - ROUNDCUBEMAIL_DB_HOST=pgsqlserver
- VIRTUAL_HOST=zathura.leene.dev - VIRTUAL_HOST=inbox.zathura.leene.dev
- VIRTUAL_PORT=9000
- LETSENCRYPT_HOST=zathura.leene.dev - LETSENCRYPT_HOST=zathura.leene.dev
- LETSENCRYPT_EMAIL=admin@zathura.leene.dev - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
depends_on: depends_on:
@ -66,7 +92,6 @@ services:
- ddnsgd - ddnsgd
restart: always restart: always
reverse-proxy: reverse-proxy:
<<: *defaults <<: *defaults
image: nginxproxy/nginx-proxy image: nginxproxy/nginx-proxy
@ -107,8 +132,8 @@ services:
build: ./config/nginx build: ./config/nginx
volumes: volumes:
sql_data:
acme-state: acme-state:
gitea_data:
nginx_certs: nginx_certs:
nginx_dhparam: nginx_dhparam:
nginx_html: nginx_html:
@ -117,3 +142,4 @@ volumes:
mail_data: mail_data:
mail_config: mail_config:
mail_state: mail_state:
sql_data:

View File

@ -32,12 +32,10 @@ ENABLE_UPDATE_CHECK=1
SSL_TYPE=letsencrypt SSL_TYPE=letsencrypt
## SQL Server Env ## SQL Server Env
POSTGRES_USER="pgadmin" POSTGRES_USER="pgadmin"
POSTGRES_INITDB_ARGS="--auth-host=scram-sha-256 --auth-local=scram-sha-256" POSTGRES_INITDB_ARGS="--auth-host=scram-sha-256 --auth-local=scram-sha-256"
POSTGRES_MULTIPLE_DATABASES="gitea, roundcube"
## Round Cube Env ## Round Cube Env