yep, more dotfiles

fix: patch pds module to use pdsadmin

+9 -10
-5
Justfile
··· 4 4 [linux] 5 5 switch PROFILE="": 6 6 sudo nixos-rebuild switch --show-trace --flake .#{{PROFILE}} 7 - 8 7 [macos] 9 8 switch PROFILE="": 10 9 darwin-rebuild switch --show-trace --flake .#{{PROFILE}} ··· 12 11 [linux] 13 12 build PROFILE="": 14 13 nixos-rebuild build --show-trace --flake .#{{PROFILE}} 15 - 16 14 [macos] 17 15 build PROFILE="": 18 16 darwin-rebuild build --show-trace --flake .#{{PROFILE}} 19 - 20 - check PROFILE="": (build PROFILE) 21 - @unlink result 22 17 23 18 home-build PROFILE: 24 19 home-manager build --show-trace --flake .#{{PROFILE}}
+6 -5
nixos/profiles/server.nix
··· 9 9 10 10 all-secrets = import ../../secrets; 11 11 12 + pds-unstable-module = import "${nixpkgs-unstable}/nixos/modules/services/web-apps/pds.nix"; 13 + pds-patched-module = args: pds-unstable-module (args // { pkgs = upkgs; }); 14 + 12 15 ext-if = "eth0"; 13 16 external-ip = "91.99.55.74"; 14 17 external-netmask = 27; ··· 28 31 29 32 agenix.nixosModules.default 30 33 31 - "${nixpkgs-unstable}/nixos/modules/services/web-apps/pds.nix" 34 + pds-patched-module 32 35 ]; 33 36 34 37 config = { ··· 79 82 # TODO: switch to nightly channel 80 83 services.pds = { 81 84 enable = true; 82 - # TODO: not possible with current unstable module import 83 - pdsadmin.enable = false; 84 - package = upkgs.pds; 85 85 86 86 settings = { 87 87 PDS_HOSTNAME = "pds.wiro.world"; 88 88 PDS_PORT = pds-port; 89 - LOG_DESTINATION = "/etc/pds.log"; 89 + # is in systemd /tmp subfolder 90 + LOG_DESTINATION = "/tmp/pds.log"; 90 91 }; 91 92 92 93 environmentFiles = [
+3
secrets/default.nix
··· 12 12 }; 13 13 14 14 deploy = { 15 + # Defines `PDS_JWT_SECRET`, `PDS_ADMIN_PASSWORD`, 16 + # `PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX`, `PDS_EMAIL_SMTP_URL` and 17 + # `PDS_EMAIL_FROM_ADDRESS` 15 18 pds-config.file = ./pds-env.age; 16 19 }; 17 20
secrets/pds-env.age

This is a binary file and will not be displayed.