#67 some cleanup after merge

Author: justb4

services/home/docker-compose.yml

@@ -18,9 +18,6 @@ services:
       - "traefik.http.routers.home_local.rule=Host(`localhost`) && Path(`/`)"
       - "traefik.http.routers.home_local.entrypoints=http"
       - "traefik.http.routers.home_local.priority=5"
-      # Common service definition
-      - "traefik.http.services.home.loadbalancer.server.port=5000"
-      - "traefik.docker.network=pygeoapi-network"
 
 networks:
   default:

services/pygeoapi_cite/docker-compose.yml

@@ -23,9 +23,7 @@ services:
       - "traefik.http.routers.pygeoapi_cite_local.rule=Host(`localhost`) && PathPrefix(`/cite`)"
       - "traefik.http.routers.pygeoapi_cite_local.entrypoints=http"
       - "traefik.http.routers.pygeoapi_cite_local.priority=100"
-      # Common service definition
-      - "traefik.http.services.pygeoapi_cite.loadbalancer.server.port=80"
-      - "traefik.docker.network=pygeoapi-network"
+
 networks:
   default:
     name: pygeoapi-network

services/pygeoapi_covid-19/docker-compose.yml

@@ -24,9 +24,6 @@ services:
       - "traefik.http.routers.pygeoapi_covid19_local.rule=Host(`localhost`) && PathPrefix(`/covid-19`)"
       - "traefik.http.routers.pygeoapi_covid19_local.entrypoints=http"
       - "traefik.http.routers.pygeoapi_covid19_local.priority=100"
-      # Common service definition
-      - "traefik.http.services.pygeoapi_covid19.loadbalancer.server.port=80"
-      - "traefik.docker.network=pygeoapi-network"
 
 networks:
   default:

services/pygeoapi_master/docker-compose.yml

@@ -22,9 +22,6 @@ services:
       - "traefik.http.routers.pygeoapi_master_local.rule=Host(`localhost`) && PathPrefix(`/master`)"
       - "traefik.http.routers.pygeoapi_master_local.entrypoints=http"
       - "traefik.http.routers.pygeoapi_master_local.priority=100"
-      # Common service definition
-      - "traefik.http.services.pygeoapi_master.loadbalancer.server.port=80"
-      - "traefik.docker.network=pygeoapi-network"
 
 networks:
   default:

services/pygeoapi_stable/docker-compose.yml

@@ -28,9 +28,6 @@ services:
       - "traefik.http.routers.pygeoapi_stable_local.rule=Host(`localhost`) && PathPrefix(`/stable`)"
       - "traefik.http.routers.pygeoapi_stable_local.entrypoints=http"
       - "traefik.http.routers.pygeoapi_stable_local.priority=100"
-      # Common service definition
-      - "traefik.http.services.pygeoapi_stable.loadbalancer.server.port=80"
-      - "traefik.docker.network=pygeoapi-network"
 
 networks:
   default:

services/traefik/README.md

@@ -0,0 +1,13 @@
+# Traefik 
+
+This directory contains Traefik, the HTTP(S) proxy that routes to 
+the various services like pygeoapi.
+
+Most of the Traefik configuration is contained in the
+[docker-compose.yml](docker-compose.yml) file.
+
+## Dynamic Configuration
+
+The `config/dynamic` directory contains:
+- `tls.yml` - TLS security options with strong cipher suites (TLS 1.2+ minimum)
+- `middlewares.yml` - HTTP security headers and CORS configuration

services/traefik/config/README.md

@@ -10,7 +10,7 @@ export HTTP_PORT=80
 [[ ${HOSTNAME} != PYGEOAPI ]] && HTTP_PORT=8000
 
 # Set Let's Encrypt email - customize as needed
-export LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL:-"just@justobjects.nl"}
+export LETSENCRYPT_EMAIL="just@justobjects.nl"
 
 # Note: acme.json is now stored in Docker volume 'acme_certificates'
 # No need to create/chmod acme.json file anymore

services/traefik/config/default.nusa.yml

@@ -3,7 +3,5 @@
 export HOSTNAME
 export HTTP_PORT=80
 [[ ${HOSTNAME} != PYGEOAPI ]] && HTTP_PORT=8000
-export ACME_FILE="config/acme.json"
 
 docker compose down --remove-orphans
-chmod 600 ${ACME_FILE}