diff --git a/.gitmodules b/.gitmodules index 5d8d554..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "bensuperpc_website"] - path = bensuperpc_website - url = git@github.com:bensuperpc/bensuperpc_website.git diff --git a/Makefile b/Makefile index 4dfa364..46e1d1d 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ DOCKER := docker -PROFILES := wp_db wordpress webserver certbot phpmyadmin flask_website flask_db pgadmin qbittorrent jellyfin +PROFILES := wp_db wordpress webserver certbot phpmyadmin qbittorrent jellyfin PROFILE_CMD := $(addprefix --profile ,$(PROFILES)) diff --git a/bensuperpc_website b/bensuperpc_website deleted file mode 160000 index 0bb75c3..0000000 --- a/bensuperpc_website +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bb75c3e6006bc5f9bd9bf540d048b800cd21d1d diff --git a/docker-compose.certbot.yml b/docker-compose.certbot.yml index 58d01f4..7facd82 100644 --- a/docker-compose.certbot.yml +++ b/docker-compose.certbot.yml @@ -12,7 +12,6 @@ services: - certbot-cert:/etc/letsencrypt - wordpress:/var/www/wordpress - jellyfin:/var/www/jellyfin - - ./bensuperpc_website:/var/www/flask #command: > # certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --staging --webroot # --webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org @@ -23,12 +22,10 @@ services: # --webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org # --webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org - # --expand command: > certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --keep-until-expiring --webroot --webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org --webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org - --webroot-path=/var/www/flask --domain flask.bensuperpc.org --domain www.flask.bensuperpc.org volumes: certbot-cert: diff --git a/nginx/conf.d/pgadmin.conf b/nginx/conf.d/pgadmin.conf deleted file mode 100644 index 7a525cb..0000000 --- a/nginx/conf.d/pgadmin.conf +++ /dev/null @@ -1,48 +0,0 @@ -#include /etc/nginx/conf.d/sub/cache-proxy.conf; - -upstream pgadmin_server { - # ip_hash; - server pgadmin:80; - # server pgadmin:80 weight=1 max_fails=3 fail_timeout=30s; -} - -# pgadmin -server { - listen 80; - listen [::]:80; - #listen 443; - #listen [::]:443; - - server_name pgadmin.bensuperpc.org www.pgadmin.bensuperpc.org; - - include /etc/nginx/conf.d/sub/gzip.conf; - - location / { - proxy_pass http://pgadmin_server; - proxy_redirect off; - proxy_set_header X-Forwarded-Host $http_host; - proxy_set_header X-Forwarded-For $remote_addr; - - #proxy_set_header Host $host; - #proxy_set_header X-Real-IP $remote_addr; - #proxy_set_header X-Forwarded-Proto $scheme; - #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; - #proxy_cache_valid 200 302 10m; - #proxy_cache_valid 301 1h; - #proxy_cache_valid any 1m; - #proxy_cache_lock on; - - #proxy_ignore_headers Vary; - #proxy_hide_header Vary; - - #add_header X-cache $upstream_cache_status; - } - - # resolver 8.8.8.8; -}