From 08789b8566ef02baaa34a26c82ddf9c8dbb25e26 Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Sat, 20 Jun 2026 18:18:01 -0500 Subject: [PATCH] add internal nginx config --- homelab-services/nimh-static/flake.nix | 1 - .../nimh-static/k3s/deployment.yaml | 8 ++++++++ .../nimh-static/k3s/kustomization.yaml | 1 + homelab-services/nimh-static/k3s/nginx.yaml | 17 +++++++++++++++++ nixos/configuration.nix | 8 +------- 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 homelab-services/nimh-static/k3s/nginx.yaml diff --git a/homelab-services/nimh-static/flake.nix b/homelab-services/nimh-static/flake.nix index bc1f94e..50f816f 100644 --- a/homelab-services/nimh-static/flake.nix +++ b/homelab-services/nimh-static/flake.nix @@ -79,7 +79,6 @@ ]; locations."/" = { - # Default k3s port? proxyPass = "http://127.0.0.1:30080"; extraConfig = '' diff --git a/homelab-services/nimh-static/k3s/deployment.yaml b/homelab-services/nimh-static/k3s/deployment.yaml index a013017..b1dead5 100644 --- a/homelab-services/nimh-static/k3s/deployment.yaml +++ b/homelab-services/nimh-static/k3s/deployment.yaml @@ -25,7 +25,15 @@ spec: - name: static-files mountPath: /var/nimh-static/site readOnly: true + + - name: nginx-config + mountPath: /etc/nginx/conf.d/default.conf + subPath: default.conf volumes: - name: static-files configMap: name: nimh-static-files + + - name: nginx-config + configMap: + name: nimh-static-nginx diff --git a/homelab-services/nimh-static/k3s/kustomization.yaml b/homelab-services/nimh-static/k3s/kustomization.yaml index dd83a80..42fa744 100644 --- a/homelab-services/nimh-static/k3s/kustomization.yaml +++ b/homelab-services/nimh-static/k3s/kustomization.yaml @@ -4,3 +4,4 @@ resources: - configmap.yaml - deployment.yaml - service.yaml + - nginx.yaml diff --git a/homelab-services/nimh-static/k3s/nginx.yaml b/homelab-services/nimh-static/k3s/nginx.yaml new file mode 100644 index 0000000..3e44af1 --- /dev/null +++ b/homelab-services/nimh-static/k3s/nginx.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: nimh-static-nginx + +data: + default.conf: | + server { + listen 80; + + root /var/nimh-static/site; + index index.html; + + location / { + try_files $uri $uri/ =404; + } + } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index e5090e3..8b227be 100755 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, meta, ... @@ -42,12 +41,6 @@ group = "acme"; }; - "minio-credentials" = { - sopsFile = ./secrets/minio.yaml; - key = "minioCredentials"; - format = "yaml"; - }; - "postgresql-credentials" = { sopsFile = ./secrets/psql.yaml; key = "credentials"; @@ -78,6 +71,7 @@ CF_API_KEY_FILE = config.sops.secrets."cloudflare-api-key".path; }; }; + certs = { "roypository.com" = { domain = "*.roypository.com";