Updates

diff --git a/caddy b/caddy
index 33f5ff55a550385ff061e7db0552840e5957d9e4..436f96e901b5f7ef65d792a12fa33d4bebf0140b 100644 (file)
--- a/caddy
+++ b/caddy
@@ -6,12 +6,6 @@
 prime8.dev {
        redir https://www.prime8.dev{uri} 301
 
 prime8.dev {
        redir https://www.prime8.dev{uri} 301
 

-       # Rate Limiting
-       rate_limit {
-               burst 20  # Allow an initial burst of 20 requests
-               limit 10  # After the burst, allow 10 requests per minute
-       }
-

        # Security
        header {
                Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" # Enforce HTTPS for 1 year
        # Security
        header {
                Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" # Enforce HTTPS for 1 year


@@ -56,12 +50,6 @@ www.prime8.dev {
                Cache-Control "public, max-age=86400; immutable" # Cache for 1 day
        }
 
                Cache-Control "public, max-age=86400; immutable" # Cache for 1 day
        }
 

-       # Rate Limiting
-       rate_limit {
-               burst 20  # Allow an initial burst of 20 requests
-               limit 10  # After the burst, allow 10 requests per minute
-       }
-

        # Security
        header {
                Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" # Enforce HTTPS for 1 year
        # Security
        header {
                Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" # Enforce HTTPS for 1 year


@@ -100,12 +88,6 @@ git.prime8.dev {
                Cache-Control "public, max-age=86400; immutable" # Cache for 1 day
        }
 
                Cache-Control "public, max-age=86400; immutable" # Cache for 1 day
        }
 

-       # Rate Limiting
-       rate_limit {
-               burst 20  # Allow an initial burst of 20 requests
-               limit 10  # After the burst, allow 10 requests per minute
-       }
-

        header {
                X-Robots-Tag "noindex, nofollow"  # Prevent search engine indexing
 
        header {
                X-Robots-Tag "noindex, nofollow"  # Prevent search engine indexing
 


@@ -130,12 +112,6 @@ csc.prime8.dev {
                Cache-Control "public, max-age=86400; immutable" # Cache for 1 day
        }
 
                Cache-Control "public, max-age=86400; immutable" # Cache for 1 day
        }
 

-       # Rate Limiting
-       rate_limit {
-               burst 20  # Allow an initial burst of 20 requests
-               limit 10  # After the burst, allow 10 requests per minute
-       }
-

        header {
                X-Robots-Tag "noindex, nofollow"  # Prevent search engine indexing
 
        header {
                X-Robots-Tag "noindex, nofollow"  # Prevent search engine indexing
 


@@ -148,4 +124,4 @@ csc.prime8.dev {
                Referrer-Policy "no-referrer-when-downgrade"  # Control referrer behavior
        }
        tls damian@prime8.dev
                Referrer-Policy "no-referrer-when-downgrade"  # Control referrer behavior
        }
        tls damian@prime8.dev

-}
+}
\ No newline at end of file

diff --git a/compose.yml b/compose.yml
index fd326c0466bdfd49450faa6393dfb67b2b4a1107..18c9129b1c973afbdbfbdd27b52f1cfeaff93057 100644 (file)
--- a/compose.yml
+++ b/compose.yml
@@ -3,15 +3,16 @@ services:
   updates:
     container_name: updates
     image: containrrr/watchtower:latest
   updates:
     container_name: updates
     image: containrrr/watchtower:latest

-    volumes: [/var/run/docker.sock:/var/run/docker.sock]
-    command: [--interval, '120', --cleanup]
+    volumes: [ /var/run/docker.sock:/var/run/docker.sock ]
+    command: [ --interval, '3600', --cleanup, --rolling-restart ]

     restart: always
   web:
     container_name: web
     image: moncheeta/website:latest
     restart: always
   web:
     container_name: web
     image: moncheeta/website:latest

-    ports: [80:80, 443:443]
+    ports: [ 80:80, 443:443 ]

     volumes:
       - ./caddy:/etc/caddy/Caddyfile:ro
     volumes:
       - ./caddy:/etc/caddy/Caddyfile:ro

+      - ./auth.conf:/etc/caddy/auth.conf:ro

       - ./web/data/:/data/caddy/
       - ./web/config/:/config/caddy/
     restart: always
       - ./web/data/:/data/caddy/
       - ./web/config/:/config/caddy/
     restart: always


@@ -20,7 +21,7 @@ services:
     image: ghcr.io/docker-mailserver/docker-mailserver:latest
     hostname: mail.prime8.dev
     env_file: ./mail/env
     image: ghcr.io/docker-mailserver/docker-mailserver:latest
     hostname: mail.prime8.dev
     env_file: ./mail/env

-    ports: [25:25, 143:143, 465:465, 587:587, 993:993]
+    ports: [ 25:25, 143:143, 465:465, 587:587, 993:993 ]

     volumes:
       - ./mail/data/:/var/mail/
       - ./mail/state/:/var/mail-state/
     volumes:
       - ./mail/data/:/var/mail/
       - ./mail/state/:/var/mail-state/


@@ -28,30 +29,30 @@ services:
       - ./mail/config/:/tmp/docker-mailserver/
       - ./web/data/certificates/acme-v02.api.letsencrypt.org-directory/mail.prime8.dev/mail.prime8.dev.crt:/etc/certificates/cert.pem
       - ./web/data/certificates/acme-v02.api.letsencrypt.org-directory/mail.prime8.dev/mail.prime8.dev.key:/etc/certificates/key.pem
       - ./mail/config/:/tmp/docker-mailserver/
       - ./web/data/certificates/acme-v02.api.letsencrypt.org-directory/mail.prime8.dev/mail.prime8.dev.crt:/etc/certificates/cert.pem
       - ./web/data/certificates/acme-v02.api.letsencrypt.org-directory/mail.prime8.dev/mail.prime8.dev.key:/etc/certificates/key.pem

-    depends_on: [web]
+    depends_on: [ web ]

     restart: always
   gitolite:
     container_name: gitolite
     image: jgiannuzzi/gitolite:latest
     env_file: ./git/env
     restart: always
   gitolite:
     container_name: gitolite
     image: jgiannuzzi/gitolite:latest
     env_file: ./git/env

-    volumes: [./git/.ssh/keys/:/etc/ssh/keys/, ./git/:/var/lib/git/]
-    ports: [22:22]
+    volumes: [ ./git/.ssh/keys/:/etc/ssh/keys/, ./git/:/var/lib/git/ ]
+    ports: [ 22:22 ]

     restart: always
   gitweb:
     container_name: gitweb
     image: moncheeta/gitweb:latest
     restart: always
   gitweb:
     container_name: gitweb
     image: moncheeta/gitweb:latest

-    depends_on: [gitolite]
+    depends_on: [ gitolite ]

     volumes:
       - ./git/gitweb.conf:/etc/gitweb.conf:ro
       - ./git/theme/:/usr/share/gitweb/theme/:ro
       - ./git/:/srv/git/:ro
     volumes:
       - ./git/gitweb.conf:/etc/gitweb.conf:ro
       - ./git/theme/:/usr/share/gitweb/theme/:ro
       - ./git/:/srv/git/:ro

-    expose: ['80']
+    expose: [ 80 ]

     restart: always
   csc:
     container_name: csc
     image: moncheeta/csc:latest
     restart: always
   csc:
     container_name: csc
     image: moncheeta/csc:latest

-    environment: [DOMAIN=csc.prime8.dev]
+    environment: [ DOMAIN=csc.prime8.dev ]

     env_file: ./csc/env
     env_file: ./csc/env

-    volumes: [./csc/auth.json:/app/google_auth.json:ro]
-    expose: ['80']
+    volumes: [ ./csc/auth.json:/app/google_auth.json:ro ]
+    expose: [ 80 ]

     restart: always
     restart: always