Update infra

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2022-11-26 10:21:10 +01:00
parent a621691c65
commit 2017aa1ebe
No known key found for this signature in database
GPG Key ID: D00C6B1021747EED
6 changed files with 35 additions and 20 deletions

View File

@ -18,14 +18,15 @@ services:
- certbot-etc:/etc/letsencrypt:ro - certbot-etc:/etc/letsencrypt:ro
networks: networks:
- app-network - app-network
db: wp_db:
image: mariadb:10.10.2 image: mariadb:10.10.2
container_name: db container_name: wp_db
profiles: profiles:
- db - db
- wordpress
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env - env/wp_database.env
volumes: volumes:
- dbdata:/var/lib/mysql - dbdata:/var/lib/mysql
networks: networks:
@ -33,19 +34,16 @@ services:
wordpress: wordpress:
depends_on: depends_on:
- db - wp_db
image: wordpress:6.1.1-php8.1-fpm image: wordpress:6.1.1-php8.1-fpm
container_name: wordpress container_name: wordpress
profiles: profiles:
- wordpress - wordpress
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env - env/wordpress.env
environment: # environment:
- WORDPRESS_DB_HOST=db:3306 # - WORDPRESS_DB_HOST=wp_db:3306
- WORDPRESS_DB_USER=$MARIADB_USER
- WORDPRESS_DB_PASSWORD=$MARIADB_PASSWORD
- WORDPRESS_DB_NAME=$MARIADB_DATABASE
volumes: volumes:
- wordpress:/var/www/html - wordpress:/var/www/html
networks: networks:
@ -73,9 +71,9 @@ services:
- PGID=1000 - PGID=1000
- TZ=Europe/London - TZ=Europe/London
- WEBUI_PORT=8080 - WEBUI_PORT=8080
#volumes: volumes:
# - /path/to/appdata/config:/config # - /path/to/appdata/config:/config
# - /path/to/downloads:/downloads - downloads:/downloads
#ports: #ports:
# - 8080:8080 # - 8080:8080
# - 6881:6881 # - 6881:6881
@ -103,14 +101,9 @@ services:
- phpmyadmin - phpmyadmin
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env - env/phpmyadmin.env
environment:
- MYSQL_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
- MYSQL_USER=$MARIADB_USER
- MYSQL_PASSWORD=$MARIADB_PASSWORD
- PMA_HOST=db
depends_on: depends_on:
- db - wp_db
networks: networks:
- app-network - app-network
volumes: volumes:
@ -120,6 +113,9 @@ volumes:
name: wordpress name: wordpress
dbdata: dbdata:
name: dbdata name: dbdata
downloads:
name: downloads
networks: networks:
app-network: app-network:

4
env/phpmyadmin.env vendored Normal file
View File

@ -0,0 +1,4 @@
MYSQL_ROOT_PASSWORD=g1qQWxTXyFXIKpAfbE0h5bxn&prr4zfd
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=4Xnc7FB7902%*w9PW4y9&anQ5&hQdTzt
PMA_HOST=db

4
env/wordpress.env vendored Normal file
View File

@ -0,0 +1,4 @@
WORDPRESS_DB_USER=bensuperpc
WORDPRESS_DB_PASSWORD=4Xnc7FB7902%*w9PW4y9&anQ5&hQdTzt
WORDPRESS_DB_NAME=wordpress
WORDPRESS_DB_HOST=wp_db:3306

4
env/wp_database.env vendored Normal file
View File

@ -0,0 +1,4 @@
MARIADB_ROOT_PASSWORD=g1qQWxTXyFXIKpAfbE0h5bxn&prr4zfd
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=4Xnc7FB7902%*w9PW4y9&anQ5&hQdTzt
MARIADB_DATABASE=wordpress

View File

@ -0,0 +1,8 @@
#stream {
# server {
# listen 25565;
# server_name minecraft.bensuperpc.org www.minecraft.bensuperpc.org;
#
# proxy_pass minecraft:25565;
# }
#}

View File

@ -19,7 +19,6 @@ server {
proxy_pass http://qbittorrent_server; proxy_pass http://qbittorrent_server;
proxy_redirect off; proxy_redirect off;
proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Forwarded-Host $http_host;
#proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
} }