Update taginfo config

Author: Rub21

hetzner/start_all.sh

@@ -31,11 +31,9 @@ cd "$SCRIPT_DIR/traefik" && ./update-cloudflare-ips.sh && cd "$SCRIPT_DIR"
 docker compose -f $SCRIPT_DIR/services.yml up -d --force-recreate
 
 ## Stop services that is not requiered for staging
-# TODO, make a better config to do not start these services and then stop them
 if [ "$ENVIRONMENT" = "staging" ]; then
-    docker stop taginfo_data
-    docker stop tiler_imposm
     docker stop node_exporter
     docker stop cadvisor
     docker stop tiler_db
+    docker stop tiler_imposm
 fi

hetzner/taginfo/taginfo.base.yml

@@ -1,19 +1,4 @@
 services:
-
-  taginfo_data:
-    container_name: taginfo_data
-    image: ghcr.io/osm-seed/taginfo:0.1.0-0.dev.git.989.h60325d0
-    volumes:
-      - ${HOME}/data/staging/taginfo_data:/usr/src/app/data
-      - ${HOME}/.aws:/root/.aws:ro
-    environment:
-      - AWS_S3_BUCKET=planet-staging.openhistoricalmap.org
-    env_file:
-      - ./.env.sample
-    restart: always
-    networks:
-      - ohm_network
-
   taginfo_web:
     container_name: taginfo_web
     image:  ghcr.io/osm-seed/taginfo-web:0.1.0-0.dev.git.983.h32750c8

hetzner/taginfo/taginfo.production.yml

@@ -15,7 +15,7 @@ services:
         crontab /tmp/cron_logs
         touch /var/log/taginfo-cron.log
         cron -f
-  
+
   taginfo_web:
     volumes:
       - ${HOME}/data/production/taginfo_data_proceced:/usr/src/app/data

hetzner/traefik/traefik.template.yml

@@ -2,15 +2,15 @@ log:
   level: INFO
 
 entryPoints:
-  port-web:  # HTTP para Cloudflare Tunnel (no expuesto públicamente)
+  port-web:
     address: ":80"
     forwardedHeaders:
       trustedIPs:
-        # Redes privadas (Docker, red local)
+        # Docker, red local
         - "172.16.0.0/12"
         - "192.168.0.0/16"
         - "10.0.0.0/8"
-        # Cloudflare IPs - Actualizado 2024 (https://www.cloudflare.com/ips-v4)
+        # From Cloudflare IPv4 (https://www.cloudflare.com/ips-v4)
         - "173.245.48.0/20"
         - "103.21.244.0/22"
         - "103.22.200.0/22"
@@ -26,26 +26,14 @@ entryPoints:
         - "104.24.0.0/14"
         - "172.64.0.0/13"
         - "131.0.72.0/22"
-        # Cloudflare IPv6 (https://www.cloudflare.com/ips-v6)
+        # From Cloudflare IPv6 (https://www.cloudflare.com/ips-v6)
         - "2400:cb00::/32"
         - "2606:4700::/32"
         - "2803:f800::/32"
         - "2405:b500::/32"
         - "2405:8100::/32"
         - "2a06:98c0::/29"
         - "2c0f:f248::/32"
-
-# Certificates NOT needed - Cloudflare Tunnel handles SSL termination
-# If you want end-to-end encryption with Let's Encrypt, uncomment below:
-# certificatesResolvers:
-#   letsencrypt:
-#     acme:
-#       email: dev@openhistoricalmap.net
-#       storage: /etc/traefik/acme/acme.json
-#       dnsChallenge:
-#         provider: cloudflare
-#       env:
-#         - CF_DNS_API_TOKEN=${CF_DNS_API_TOKEN}
 
 http:
   middlewares:
@@ -102,33 +90,17 @@ http:
       entryPoints:
         - port-web
       service: tiler_server
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers-allow-iframe
         # Note: Removed replace-osm-to-ohm middleware because Tegola map is named "osm"
         # - replace-osm-to-ohm
         # - replace-osm-tiles-to-ohm
 
-    # tiler_cache-router:
-    #   rule: Host(`tiler-cache.{{OHM_DOMAIN}}`)
-    #   entryPoints:
-    #     - port-secure
-    #   service: tiler_cache
-    #   tls:
-    #     certResolver: letsencrypt
-    #   middlewares:
-    #     - secure-headers
-
     nominatim-router:
       rule: Host(`nominatim.{{OHM_DOMAIN}}`) && !PathPrefix(`/ui`)
       entryPoints:
         - port-web
       service: nominatim
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers
         - redirect-nominatim
@@ -138,9 +110,6 @@ http:
       entryPoints:
         - port-web
       service: nominatim_ui
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers
 
@@ -149,9 +118,6 @@ http:
       entryPoints:
         - port-web
       service: overpass_api
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers
 
@@ -160,9 +126,6 @@ http:
       entryPoints:
         - port-web
       service: osmcha_web
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers
 
@@ -171,9 +134,6 @@ http:
       entryPoints:
         - port-web
       service: taginfo
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers
 
@@ -182,9 +142,6 @@ http:
       entryPoints:
         - port-web
       service: node_exporter
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers
 
@@ -193,9 +150,6 @@ http:
       entryPoints:
         - port-web
       service: cadvisor
-      # TLS handled by Cloudflare Tunnel - uncomment if using Let's Encrypt:
-      # tls:
-      #   certResolver: letsencrypt
       middlewares:
         - secure-headers
 
@@ -205,11 +159,6 @@ http:
         servers:
           - url: http://tiler_server:9090
 
-    # tiler_cache:
-    #   loadBalancer:
-    #     servers:
-    #       - url: http://tiler_cache:8000
-
     nominatim:
       loadBalancer:
         servers: