diff --git a/docker-compose.yml b/docker-compose.yml index cea1535..c52e81e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -64,35 +64,6 @@ services: environment: MAILNAME: space.abhinavsarkar.net - pihole: - image: pihole/pihole:v5.1.2 - environment: - ServerIP: ${PH_SERVER_IP} - WEBPASSWORD: ${PH_PASSWORD} - DNS1: 1.1.1.1 - DNS2: 1.0.0.1 - VIRTUAL_HOST: pihole.abhinavsarkar.net - TZ: "Asia/Kolkata" - ports: - - "53:53/tcp" - - "53:53/udp" - restart: unless-stopped - volumes: - - ./pihole-data/pihole:/etc/pihole - - ./pihole-data/dnsmasq:/etc/dnsmasq.d - - ${PWD}/pihole-log/pihole.log:/var/log/pihole.log - dns: - - 127.0.0.1 - - 1.1.1.1 - depends_on: - - cloudflared - - cloudflared: - image: visibilityspots/cloudflared - environment: - UPSTREAM1: https://cloudflare-dns.com/dns-query - UPSTREAM2: https://mozilla.cloudflare-dns.com/dns-query - gitea: image: gitea/gitea:1.7.6 environment: @@ -128,7 +99,7 @@ services: - .:/opt/space matomo: - image: matomo:4.1-fpm + image: matomo:4.3-fpm volumes: - ./matomo-config:/var/www/html/config - matomo:/var/www/html diff --git a/nginx-conf/pihole.conf b/nginx-conf/pihole.conf deleted file mode 100644 index d2c594c..0000000 --- a/nginx-conf/pihole.conf +++ /dev/null @@ -1,30 +0,0 @@ -server { - listen 443 ssl; - server_name pihole.abhinavsarkar.net; - - ssl_certificate /etc/nginx/certs/fullchain1.pem; - ssl_certificate_key /etc/nginx/certs/privkey1.pem; - - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - - proxy_set_header X-Real-IP $remote_addr; # pass on real client IP - - location / { - proxy_pass http://pihole; - } -} - -server { - listen 80; - server_name pihole.abhinavsarkar.net; - return 301 https://$host$request_uri; -} - -server { - listen 80 default_server; - location / { - proxy_pass http://pihole; - } -}