diff --git a/README.md b/README.md index 671f924..415e5d9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,13 @@ # Infrastructure -_My infrastructure_ +_My personal infrastructure for my servers and services._ ## About -This is my infrastructure. It's a collection of scripts and configuration files that I use to manage my servers. +This is my infrastructure. It's a collection of scripts and configuration files that I use to manage my servers and services. It uses Nginx and docker-compose to run my services (And many other things). -It's a work in progress, and I'm still learning a lot about it. +It's a **work in progress**, and I'm still learning a lot about it. +If you have any **questions** or **suggestions**, feel free to open an issue or a pull request. ## Features @@ -22,6 +23,7 @@ It's a work in progress, and I'm still learning a lot about it. - [ ] Jellyfin - [ ] Gitea - [ ] Mastodon +- [ ] Minecraft server (Hyperworld v2) - [ ] SSL for all subdomains / Services (Not just the main domain) ## Screenshots diff --git a/docker-compose.yml b/docker-compose.yml index 95744bc..203da04 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -91,8 +91,8 @@ services: - TZ=Europe/London - WEBUI_PORT=8080 volumes: - # - /path/to/appdata/config:/config - - downloads:/downloads + - ./qbittorrent-conf/config:/config + - downloads:/downloads #ports: # - 8080:8080 # - 6881:6881 @@ -121,6 +121,8 @@ services: restart: unless-stopped env_file: - env/phpmyadmin.env +# ports: +# - 8080:80 depends_on: - wp_db networks: diff --git a/nginx-conf/pgadmin.conf b/nginx-conf/pgadmin.conf index 57aa3f4..7a525cb 100644 --- a/nginx-conf/pgadmin.conf +++ b/nginx-conf/pgadmin.conf @@ -29,6 +29,7 @@ server { #proxy_set_header X-Forwarded-Host $host:$server_port; #proxy_set_header X-Forwarded-Server $host; #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_set_header X-Forwarded-Ssl on; # Uncomment if you want to enable proxy cache #proxy_cache PROXY; diff --git a/nginx-conf/wordpress.conf b/nginx-conf/wordpress.conf index 7d9d0b2..3413a6b 100644 --- a/nginx-conf/wordpress.conf +++ b/nginx-conf/wordpress.conf @@ -12,7 +12,7 @@ server { listen 80; listen [::]:80; - server_name bensuperpc.org www.bensuperpc.org; + server_name bensuperpc.org www.bensuperpc.org wordpress.bensuperpc.org www.wordpress.bensuperpc.org; location ~ /.well-known/acme-challenge { allow all; @@ -28,7 +28,7 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name bensuperpc.org www.bensuperpc.org; + server_name bensuperpc.org www.bensuperpc.org wordpress.bensuperpc.org www.wordpress.bensuperpc.org; root /var/www/html; index index.php index.html index.htm;