lieuwe/dockerconfig
1
0
Fork 0
mirror of https://github.com/lleene/dockerconfig.git synced 2025-01-23 05:12:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Lieuwe Leene 2022-11-13 10:19:12 +01:00
parent d75cbb6fdb
commit c8fe500d18
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/nginx/git.zathura.leene.dev_location
View File

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

5
config/nginx/inbox.zathura.leene.dev_location
View File

@ -1,7 +1,6 @@
root /var/www/html/roundcubemail; root /var/www/html/roundcube;
index index.php index.html index.htm; index index.php index.html index.htm;
client_max_body_size 128M;
location / { location / {
try_files $uri $uri/ /index.php?q=$uri&$args; try_files $uri $uri/ /index.php?q=$uri&$args;
@ -11,8 +10,8 @@ location ~ \.php$ {
try_files $uri =404; try_files $uri =404;
fastcgi_keep_conn on; fastcgi_keep_conn on;
fastcgi_split_path_info ^(.+\.php)(.*)$; fastcgi_split_path_info ^(.+\.php)(.*)$;
fastcgi_pass zathura.leene.dev;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_pass inbox.zathura.leene.dev;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params; include fastcgi_params;

16
docker-compose.yaml
View File

@ -34,7 +34,7 @@ services:
environment: environment:
- VIRTUAL_HOST=git.zathura.leene.dev - VIRTUAL_HOST=git.zathura.leene.dev
- VIRTUAL_PORT=3000 - VIRTUAL_PORT=3000
- LETSENCRYPT_HOST=zathura.leene.dev - LETSENCRYPT_HOST=git.zathura.leene.dev
- LETSENCRYPT_EMAIL=admin@zathura.leene.dev - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
volumes: volumes:
- gitea_data:/data:z - gitea_data:/data:z
@ -57,7 +57,7 @@ services:
- ROUNDCUBEMAIL_DB_HOST=pgsqlserver - ROUNDCUBEMAIL_DB_HOST=pgsqlserver
- VIRTUAL_HOST=inbox.zathura.leene.dev - VIRTUAL_HOST=inbox.zathura.leene.dev
- VIRTUAL_PORT=9000 - VIRTUAL_PORT=9000
- LETSENCRYPT_HOST=zathura.leene.dev - LETSENCRYPT_HOST=inbox.zathura.leene.dev
- LETSENCRYPT_EMAIL=admin@zathura.leene.dev - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
depends_on: depends_on:
- pgsqlserver - pgsqlserver
@ -66,14 +66,14 @@ services:
expose: expose:
- "9000" - "9000"
volumes: volumes:
- nginx_html/roundcubemail:/var/www/html - mail_html:/var/www/html:z
mailserver: mailserver:
build: ./config/mail build: ./config/mail
<<: *defaults <<: *defaults
image: mailserver/docker-mailserver:latest image: mailserver/docker-mailserver:latest
container_name: mailserver container_name: mailserver
hostname: mail hostname: inbox
domainname: zathura.leene.dev domainname: zathura.leene.dev
ports: ports:
- "25:25" - "25:25"
@ -81,7 +81,7 @@ services:
- "587:587" - "587:587"
- "993:993" - "993:993"
volumes: volumes:
- nginx_certs:/etc/letsencrypt/live/ - nginx_certs:/etc/letsencrypt/live:ro
- mail_data:/var/mail/:z - mail_data:/var/mail/:z
- mail_state:/var/mail-state/:z - mail_state:/var/mail-state/:z
- mail_config:/tmp/docker-mailserver/:z - mail_config:/tmp/docker-mailserver/:z
@ -106,7 +106,8 @@ services:
- nginx_conf:/etc/nginx/conf.d/:z - nginx_conf:/etc/nginx/conf.d/:z
- nginx_vhost:/etc/nginx/vhost.d/:z - nginx_vhost:/etc/nginx/vhost.d/:z
- nginx_html:/usr/share/nginx/html/: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 - /var/run/docker.sock:/tmp/docker.sock:z
depends_on: depends_on:
- ddnsgd - ddnsgd
@ -129,7 +130,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:z - /var/run/docker.sock:/var/run/docker.sock:z
depends_on: depends_on:
- ddnsgd - ddnsgd
build: ./config/nginx
volumes: volumes:
acme-state: acme-state:
@ -142,4 +143,5 @@ volumes:
mail_data: mail_data:
mail_config: mail_config:
mail_state: mail_state:
mail_html:
sql_data: sql_data: