diff --git a/flux/cluster/apps/drone/runner.yaml b/flux/cluster/apps/drone/runner.yaml index e71c777..1170267 100644 --- a/flux/cluster/apps/drone/runner.yaml +++ b/flux/cluster/apps/drone/runner.yaml @@ -20,21 +20,6 @@ spec: image: drone/drone-runner-kube:latest ports: - containerPort: 3000 - env: - - name: DRONE_RPC_SECRET - valueFrom: - secretKeyRef: - name: drone-secrets - key: drone-rpc-secret - - name: DRONE_RPC_HOST - valueFrom: - secretKeyRef: - name: drone-secrets - key: drone-server-host - - name: DRONE_RPC_PROTO - valueFrom: - secretKeyRef: - name: drone-secrets - key: drone-server-proto - - name: DRONE_NAMESPACE_DEFAULT - value: drone \ No newline at end of file + envFrom: + - secretRef: + name: drone-secrets \ No newline at end of file diff --git a/flux/cluster/apps/drone/secret.yaml b/flux/cluster/apps/drone/secret.yaml index d5a694d..051c2f3 100644 --- a/flux/cluster/apps/drone/secret.yaml +++ b/flux/cluster/apps/drone/secret.yaml @@ -46,4 +46,8 @@ spec: - secretKey: DRONE_DATABASE_DATASOURCE remoteRef: key: k8s/drone - property: drone-db-url \ No newline at end of file + property: drone-db-url + - secretKey: DRONE_NAMESPACE_DEFAULT + remoteRef: + key: k8s/drone + property: namespace \ No newline at end of file diff --git a/nixos/machines/nginx/default.nix b/nixos/machines/nginx/default.nix index 22215cb..58e6025 100644 --- a/nixos/machines/nginx/default.nix +++ b/nixos/machines/nginx/default.nix @@ -89,12 +89,9 @@ in { virtualHosts."galerie.asraphiel.dev" = k8sProxy; virtualHosts."staging.galerievanslagmaat.nl" = k8sProxy; virtualHosts."galerie-staging.asraphiel.dev" = k8sProxy; - virtualHosts."www.galerievanslagmaat.nl" = { - forceSSL = true; - enableACME = true; - http2 = true; - globalRedirect = "galerievanslagmaat.nl"; - }; + virtualHosts."www.galerievanslagmaat.nl" = redirect "galerievanslagmaat.nl"; + virtualHosts."galeriewoerden.nl" = redirect "galerievanslagmaat.nl"; + virtualHosts."www.galeriewoerden.nl" = redirect "galerievanslagmaat.nl"; }; services.prometheus.exporters.nginx.enable = true;