diff --git a/flux/cluster/apps/asraphiel/umami/ingress.yaml b/flux/cluster/apps/asraphiel/umami/ingress.yaml index 16cde88..091566d 100644 --- a/flux/cluster/apps/asraphiel/umami/ingress.yaml +++ b/flux/cluster/apps/asraphiel/umami/ingress.yaml @@ -3,15 +3,17 @@ kind: Ingress metadata: name: umami-deployment-ingress namespace: asraphiel + annotations: + traefik.ingress.kubernetes.io/router.middlewares: asraphiel-umamijs@kubernetescrd spec: rules: - - host: "analytics.asraphiel.dev" - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: umami-deployment-service - port: - number: 80 \ No newline at end of file + - host: "ikaros.asraphiel.dev" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: umami-deployment-service + port: + number: 80 diff --git a/flux/cluster/apps/asraphiel/umami/kustomization.yaml b/flux/cluster/apps/asraphiel/umami/kustomization.yaml index fca7dad..106e277 100644 --- a/flux/cluster/apps/asraphiel/umami/kustomization.yaml +++ b/flux/cluster/apps/asraphiel/umami/kustomization.yaml @@ -4,4 +4,5 @@ resources: - deployment.yaml - ingress.yaml - service.yaml - - secret.yaml \ No newline at end of file + - secret.yaml + - middleware.yaml \ No newline at end of file diff --git a/flux/cluster/apps/asraphiel/umami/middleware.yaml b/flux/cluster/apps/asraphiel/umami/middleware.yaml new file mode 100644 index 0000000..de5d45a --- /dev/null +++ b/flux/cluster/apps/asraphiel/umami/middleware.yaml @@ -0,0 +1,9 @@ +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: umamijs + namespace: asraphiel +spec: + replacePathRegex: + regex: ^/script\.js + replacement: /umami.js \ No newline at end of file diff --git a/nixos/machines/nginx/default.nix b/nixos/machines/nginx/default.nix index cd6fbd1..db84155 100644 --- a/nixos/machines/nginx/default.nix +++ b/nixos/machines/nginx/default.nix @@ -21,7 +21,12 @@ let ''; }; }; - + redirect = dest: { + forceSSL = true; + enableACME = true; + http2 = true; + globalRedirect = dest; + }; k8sProxy = proxy "http://kubernetes.lxd:8080/"; in { imports = [ ../../common ../../common/lxc.nix ]; @@ -52,20 +57,14 @@ in { virtualHosts."s3.asraphiel.dev" = bigProxy "http://minio.lxd:9000/"; virtualHosts."shell.s3.asraphiel.dev" = proxy "http://minio.lxd:9001/"; - virtualHosts."cdn.voidcorp.nl" = { - forceSSL = true; - enableACME = true; - http2 = true; - globalRedirect = "s3.asraphiel.dev"; - }; + virtualHosts."cdn.voidcorp.nl" = redirect "s3.asraphiel.dev"; virtualHosts."cdn.asraphiel.dev" = k8sProxy; virtualHosts."registry.asraphiel.dev" = proxy "http://registry.lxd:5000/"; - virtualHosts."registrydbg.asraphiel.dev" = - proxy "http://registry.lxd:5001/"; virtualHosts."vaultwarden.asraphiel.dev" = proxy "http://vaultwarden.lxd:8000/"; - virtualHosts."analytics.asraphiel.dev" = k8sProxy; + virtualHosts."analytics.asraphiel.dev" = redirect "ikaros.asraphiel.dev"; + virtualHosts."ikaros.asraphiel.dev" = k8sProxy; virtualHosts."whoami.asraphiel.dev" = k8sProxy; virtualHosts."groenehartansichtkaarten.nl" = k8sProxy;