diff --git a/data/services.toml b/data/services.toml index 722b3be4..85b29704 100644 --- a/data/services.toml +++ b/data/services.toml @@ -128,6 +128,11 @@ host = "marvin" extUrl = "bw.pyrox.dev" anubis = 8409 +[voidauth] +port = 6932 +host = "marvin" +extUrl = "auth.pyrox.dev" + [webmentiond] port = 6925 host = "marvin" diff --git a/hosts/marvin/services/auth-provider.nix b/hosts/marvin/services/auth-provider.nix index 5d74398e..912a2b05 100644 --- a/hosts/marvin/services/auth-provider.nix +++ b/hosts/marvin/services/auth-provider.nix @@ -4,8 +4,8 @@ ... }: let - d = self.lib.data.services.pocket-id; sec = config.age.secrets; + d = self.data.services.voidauth; in { dish.voidauth = { @@ -34,23 +34,10 @@ in }; }; age.secrets = { - pocket-id-secrets = { - file = ./secrets/pocket-id-secrets.age; - owner = "pocket-id"; - group = "pocket-id"; - }; voidauth-secrets = { file = ./secrets/voidauth-secrets.age; owner = "voidauth"; group = "voidauth"; }; }; - services.anubis.instances = { - pocket-id = { - settings = { - BIND = ":${toString d.anubis}"; - TARGET = "http://localhost:${toString d.port}"; - }; - }; - }; } diff --git a/hosts/marvin/services/secrets/pocket-id-secrets.age b/hosts/marvin/services/secrets/pocket-id-secrets.age deleted file mode 100644 index d793d73f..00000000 --- a/hosts/marvin/services/secrets/pocket-id-secrets.age +++ /dev/null @@ -1,20 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 iqBxIA i86B3rXDutydgIArCobSTEHaPmwdq3v/KZh+nvuM31g -bZ25zrMVcripCl7DT+HfAHl/eYG2SEuhGc6sotGKhYo --> ssh-rsa fFaiTA -yhxdQUetszZrwFdeI4QgVyHRuimqmFON+2b0EKqZwKIkUQXML3yuzAaT9sg10WpK -6A9/+xcNZQDOWn5MYoHaJoEqPPKoLuN6q12NCt5G0zckoTPM/S+v1RoNSlMZPDKY -BJGEGYw1LwDIuC3nQ5d6n/RM5Te9ymgZCP6FG8ggps3pASH/tE9gJWXmnGosJ19B -pg+LcsJ8nFvXUZ2vdXIWxwAvhM0G7uoVPWF4tgH3AfryUoEdlEIycLfPVC6LdnWI -kV5wnLzlmfEBPdzc7kVDcTh+lzI2wrA9AJrrX4WgIcKBigfJuFc/IsY4DBK23/m1 -sDogMBwZ1yenrwE9GU35qXLfRixDW4gHYPyaAuhHmIA0XX1FS57qzFVVmPJ6xqO9 -Q8Fp8suRWZSUlEKnbOV7PJjbcIn5Z+u2hbYf4pPtyVhEcNQU/fB/R4/fCA2pzz/0 -fSfrRgsyRQ4+ZJZr/pcVNDODzIms19c7OJJ3Imaf320jHKDu1PjmOxHrDQ7FfJ6D -hujpORCu0Q8eYb4dgFTNXck3eUdgb7R1Pv73MaTbugg9vjBoz/dDwDkZjGjLSexw -izhPyCrS48a54k9Z4nNx0n8HZoJ6RfCX6HuYB0jLx4f0xV9gQkQX5ABs9Jdjr6vV -pM1hc2nQQy32QbebRWuFePV8ci975nur8+FJX42B2uY --> ssh-ed25519 wpmdHA L6GgtfNDOH9pPOcq1h6HQrgojmURSg9NgjD8Twwl6AI -WnokXKhhgnnU1/BDs5yGN/A2K08jeu+/97wT9B2damM ---- txPjWCn9HITn+cJV7DzzSS0rtyRZmzJy/r74hJ4fbGo -A�a0�GڗN�Z�F����/��&i�ׇ�R��@��>����KC��3.'Ƨ � P�n�޼��"M6��_�gK -Yr�R[��;�x�s�U���-�/O�@ryZ;A���Q�?<�@�j.)���^����9�wQ��<$���يy����̝�KzHn�?�D�] ��`���L`b"]W�59�����a%��{Qf�=�7D�k�{ \ No newline at end of file diff --git a/hosts/marvin/services/secrets/secrets.nix b/hosts/marvin/services/secrets/secrets.nix index bd234b9e..ad5d6d19 100644 --- a/hosts/marvin/services/secrets/secrets.nix +++ b/hosts/marvin/services/secrets/secrets.nix @@ -32,7 +32,6 @@ in "miniflux-admin.age".publicKeys = pqKeys; "pinchflat-secrets.age".publicKeys = pqKeys; "planka-env.age".publicKeys = marvinDefault; - "pocket-id-secrets.age".publicKeys = marvinDefault; "tsnsrv-auth-key.age".publicKeys = pqKeys; "vaultwarden-vars.age".publicKeys = pqKeys; "voidauth-secrets.age".publicKeys = pqKeys; diff --git a/hosts/prefect/services/caddy.nix b/hosts/prefect/services/caddy.nix index 31658bb4..bf336c7a 100644 --- a/hosts/prefect/services/caddy.nix +++ b/hosts/prefect/services/caddy.nix @@ -79,9 +79,9 @@ in }; # Authentication - ${pns.pocket-id.extUrl} = { + ${pns.voidauth.extUrl} = { extraConfig = '' - reverse_proxy ${marvin}:${toString pns.pocket-id.port} + reverse_proxy ${marvin}:${toString pns.voidauth.port} ''; };