Merge branch 'main' into bazarr-app-init

dynamic/services.yaml

@@ -35,11 +35,6 @@ http:
         customRequestHeaders:
           Connection: "Upgrade"
           Upgrade: "websocket"
-#      # Preserve auth headers for WS
-#      accessControlAllowHeaders:
-#        - Authorization
-#        - Sec-Websocket-Protocol
-#        - Sec-Websocket-Key
 
     dcr-cors:
       headers:
@@ -56,31 +51,6 @@ http:
           - Content-Type
         accessControlMaxAge: 1728000
 
-    nakama-cors:
-      headers:
-        accessControlAllowOriginList:
-          - "https://games.aetoskia.com"
-        accessControlAllowMethods:
-          - GET
-          - POST
-          - PUT
-          - DELETE
-          - OPTIONS
-        accessControlAllowHeaders:
-          - Authorization
-          - Content-Type
-        accessControlMaxAge: 1728000
-
-    blog-api-strip:
-      stripPrefix:
-        prefixes:
-          - "/blogs"
-
-    coverage-api-strip:
-      stripPrefix:
-        prefixes:
-          - "/coverage"
-
   routers:
     # ----------------------
     # HTTP routers for redirect
@@ -93,22 +63,6 @@ http:
         - redirect-to-https
       service: noop@internal
 
-    blog-http:
-      rule: "Host(`blog.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
-    games-http:
-      rule: "Host(`games.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
     # Dashboard
     traefik-dashboard-http:
       rule: "Host(`traefik.aetoskia.com`)"
@@ -190,14 +144,6 @@ http:
         - redirect-to-https
       service: noop@internal
 
-    docs-http:
-      rule: "Host(`docs.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
     drone-http:
       rule: "Host(`drone.aetoskia.com`)"
       entryPoints:
@@ -222,14 +168,6 @@ http:
         - redirect-to-https
       service: noop@internal
 
-    pypiserver-http:
-      rule: "Host(`pip.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
     netdata-http:
       rule: "Host(`netdata.aetoskia.com`)"
       entryPoints:
@@ -246,46 +184,6 @@ http:
         - redirect-to-https
       service: noop@internal
 
-    mongo-express-http:
-      rule: "Host(`mongo.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
-    pgadmin-http:
-      rule: "Host(`postgres.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
-    api-http:
-      rule: "Host(`api.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
-    nakama-http:
-      rule: "Host(`nakama.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
-    auth-api-http:
-      rule: "Host(`auth.aetoskia.com`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-to-https
-      service: noop@internal
-
     # ----------------------
     # HTTPS routers
     # ----------------------
@@ -301,22 +199,6 @@ http:
 #        - basic-auth
         - websocket-headers
 
-    blog:
-      rule: "Host(`blog.aetoskia.com`)"
-      entryPoints:
-        - websecure
-      service: blog-svc
-      tls:
-        certResolver: aetoskia
-
-    games:
-      rule: "Host(`games.aetoskia.com`)"
-      entryPoints:
-        - websecure
-      service: games-svc
-      tls:
-        certResolver: aetoskia
-
     # Dashboard
     traefik-dashboard:
       rule: "Host(`traefik.aetoskia.com`)"
@@ -406,16 +288,6 @@ http:
       middlewares:
         - websocket-headers
 
-    docs:
-      rule: "Host(`docs.aetoskia.com`)"
-      entryPoints:
-        - websecure
-      service: docs-svc
-      tls:
-        certResolver: aetoskia
-      middlewares:
-        - websocket-headers
-
     drone:
       rule: "Host(`drone.aetoskia.com`)"
       entryPoints:
@@ -444,14 +316,6 @@ http:
       tls:
         certResolver: aetoskia
 
-    pypiserver:
-      rule: "Host(`pip.aetoskia.com`)"
-      entryPoints:
-        - websecure
-      service: pypiserver-svc
-      tls:
-        certResolver: aetoskia
-
     # Monitoring
     netdata:
       rule: "Host(`netdata.aetoskia.com`)"
@@ -471,71 +335,6 @@ http:
       tls:
         certResolver: aetoskia
 
-    mongo-express:
-      rule: "Host(`mongo.aetoskia.com`)"
-      entryPoints:
-        - websecure
-      service: mongo-express-svc
-      tls:
-        certResolver: aetoskia
-
-    pgadmin:
-      rule: "Host(`postgres.aetoskia.com`)"
-      entryPoints:
-        - websecure
-      service: pgadmin-svc
-      tls:
-        certResolver: aetoskia
-
-    blog-api:
-      rule: "Host(`api.aetoskia.com`) && PathPrefix(`/blogs`)"
-      entryPoints:
-        - websecure
-      service: blog-api-svc
-      tls:
-        certResolver: aetoskia
-      middlewares:
-        - blog-api-strip
-
-    coverage-api:
-      rule: "Host(`api.aetoskia.com`) && PathPrefix(`/coverage`)"
-      entryPoints:
-        - websecure
-      service: coverage-api-svc
-      tls:
-        certResolver: aetoskia
-      middlewares:
-        - coverage-api-strip
-
-    nakama:
-      rule: "Host(`nakama.aetoskia.com`)"
-#      rule: "Host(`nakama.aetoskia.com`) && !PathPrefix(`/ws`)"
-      entryPoints:
-        - websecure
-      service: nakama-svc
-      tls:
-        certResolver: aetoskia
-      middlewares:
-        - nakama-cors
-
-    nakama-ws:
-      rule: "Host(`nakama.aetoskia.com`) && PathPrefix(`/ws`)"
-      entryPoints:
-        - websecure
-      service: nakama-svc
-      tls:
-        certResolver: aetoskia
-      middlewares:
-        - websocket-headers
-
-    auth-api:
-      rule: "Host(`auth.aetoskia.com`)"
-      entryPoints:
-        - websecure
-      service: auth-api-svc
-      tls:
-        certResolver: aetoskia
-
   services:
     # ----------------------
     # HTTP Services
@@ -546,18 +345,6 @@ http:
         servers:
           - url: "http://server-pi:3001"
 
-    # Blog
-    blog-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:3002"
-
-    # Games
-    games-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:3003"
-
     # Media
     plex-svc:
       loadBalancer:
@@ -605,11 +392,6 @@ http:
         servers:
           - url: "http://private-pi:6002"
 
-    docs-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:6007"
-
     drone-svc:
       loadBalancer:
         servers:
@@ -625,11 +407,6 @@ http:
         servers:
           - url: "http://server-pi:6001"
 
-    pypiserver-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:6006"
-
     # Monitoring
     netdata-svc:
       loadBalancer:
@@ -640,36 +417,3 @@ http:
       loadBalancer:
         servers:
           - url: "http://private-pi:7002"
-
-    mongo-express-svc:
-      loadBalancer:
-        servers:
-          - url: "http://private-pi:8001"
-
-    pgadmin-svc:
-      loadBalancer:
-        servers:
-          - url: "http://private-pi:8002"
-
-    # ----------------------
-    # API
-    # ----------------------
-    blog-api-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:9001"
-
-    coverage-api-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:9002"
-
-    auth-api-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:9003"
-
-    nakama-svc:
-      loadBalancer:
-        servers:
-          - url: "http://server-pi:7350"

traefik.yaml

@@ -5,10 +5,6 @@ entryPoints:
     address: ":443"
   ssh:
     address: ":22"
-  mongo:
-    address: ":27017"
-  postgres:
-    address: ":5432"
 
 providers:
   file: