yep, more dotfiles

fix: patch pds module to use pdsadmin

Changed files
+9 -10
nixos
profiles
secrets
-5
Justfile
···
[linux]
switch PROFILE="":
sudo nixos-rebuild switch --show-trace --flake .#{{PROFILE}}
-
[macos]
switch PROFILE="":
darwin-rebuild switch --show-trace --flake .#{{PROFILE}}
···
[linux]
build PROFILE="":
nixos-rebuild build --show-trace --flake .#{{PROFILE}}
-
[macos]
build PROFILE="":
darwin-rebuild build --show-trace --flake .#{{PROFILE}}
-
-
check PROFILE="": (build PROFILE)
-
@unlink result
home-build PROFILE:
home-manager build --show-trace --flake .#{{PROFILE}}
···
[linux]
switch PROFILE="":
sudo nixos-rebuild switch --show-trace --flake .#{{PROFILE}}
[macos]
switch PROFILE="":
darwin-rebuild switch --show-trace --flake .#{{PROFILE}}
···
[linux]
build PROFILE="":
nixos-rebuild build --show-trace --flake .#{{PROFILE}}
[macos]
build PROFILE="":
darwin-rebuild build --show-trace --flake .#{{PROFILE}}
home-build PROFILE:
home-manager build --show-trace --flake .#{{PROFILE}}
+6 -5
nixos/profiles/server.nix
···
all-secrets = import ../../secrets;
ext-if = "eth0";
external-ip = "91.99.55.74";
external-netmask = 27;
···
agenix.nixosModules.default
-
"${nixpkgs-unstable}/nixos/modules/services/web-apps/pds.nix"
];
config = {
···
# TODO: switch to nightly channel
services.pds = {
enable = true;
-
# TODO: not possible with current unstable module import
-
pdsadmin.enable = false;
-
package = upkgs.pds;
settings = {
PDS_HOSTNAME = "pds.wiro.world";
PDS_PORT = pds-port;
-
LOG_DESTINATION = "/etc/pds.log";
};
environmentFiles = [
···
all-secrets = import ../../secrets;
+
pds-unstable-module = import "${nixpkgs-unstable}/nixos/modules/services/web-apps/pds.nix";
+
pds-patched-module = args: pds-unstable-module (args // { pkgs = upkgs; });
+
ext-if = "eth0";
external-ip = "91.99.55.74";
external-netmask = 27;
···
agenix.nixosModules.default
+
pds-patched-module
];
config = {
···
# TODO: switch to nightly channel
services.pds = {
enable = true;
settings = {
PDS_HOSTNAME = "pds.wiro.world";
PDS_PORT = pds-port;
+
# is in systemd /tmp subfolder
+
LOG_DESTINATION = "/tmp/pds.log";
};
environmentFiles = [
+3
secrets/default.nix
···
};
deploy = {
pds-config.file = ./pds-env.age;
};
···
};
deploy = {
+
# Defines `PDS_JWT_SECRET`, `PDS_ADMIN_PASSWORD`,
+
# `PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX`, `PDS_EMAIL_SMTP_URL` and
+
# `PDS_EMAIL_FROM_ADDRESS`
pds-config.file = ./pds-env.age;
};
secrets/pds-env.age

This is a binary file and will not be displayed.