diff --git a/flux/olympus/apps/websites/0x76.yaml b/flux/olympus/apps/websites/0x76.yaml index d81ec0f..1df0ce7 100644 --- a/flux/olympus/apps/websites/0x76.yaml +++ b/flux/olympus/apps/websites/0x76.yaml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: x76dev - namespace: websites labels: app: x76dev spec: @@ -25,7 +24,6 @@ apiVersion: v1 kind: Service metadata: name: x76dev-service - namespace: websites spec: selector: app: x76dev @@ -37,7 +35,6 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: x76dev-ingress - namespace: websites spec: rules: - host: "0x76.dev" diff --git a/flux/olympus/apps/websites/kustomization.yaml b/flux/olympus/apps/websites/kustomization.yaml index 1a4998e..c1c80c7 100644 --- a/flux/olympus/apps/websites/kustomization.yaml +++ b/flux/olympus/apps/websites/kustomization.yaml @@ -1,4 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +metadata: + namespace: websites resources: - 0x76.yaml diff --git a/nixos/common/common.nix b/nixos/common/common.nix index 14b5755..b9d1f14 100644 --- a/nixos/common/common.nix +++ b/nixos/common/common.nix @@ -72,7 +72,9 @@ # Enable SSH services.openssh = { enable = true; - passwordAuthentication = false; - permitRootLogin = lib.mkDefault "no"; + settings = { + PasswordAuthentication = lib.mkDefault false; + PermitRootLogin = lib.mkDefault "no"; + }; }; } diff --git a/nixos/templates/proxmox-lxc.nix b/nixos/templates/proxmox-lxc.nix index e748529..d917eec 100644 --- a/nixos/templates/proxmox-lxc.nix +++ b/nixos/templates/proxmox-lxc.nix @@ -10,8 +10,10 @@ # Enable SSH services.openssh = { enable = true; - passwordAuthentication = false; - permitRootLogin = "yes"; + settings = { + PasswordAuthentication = true; + PermitRootLogin = "yes"; + }; openFirewall = true; }; diff --git a/nixos/templates/proxmox-vm.nix b/nixos/templates/proxmox-vm.nix index 945cce3..b1cdda8 100644 --- a/nixos/templates/proxmox-vm.nix +++ b/nixos/templates/proxmox-vm.nix @@ -7,12 +7,14 @@ memory = 1024; bios = "ovmf"; }; - + # Enable SSH services.openssh = { enable = true; - passwordAuthentication = false; - permitRootLogin = "yes"; + settings = { + PasswordAuthentication = true; + PermitRootLogin = "yes"; + }; openFirewall = true; };