numbus/Numbus
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Get envsubst to replace only necessary variables

Browse Source
This commit is contained in:
Raphaël Numbus
2026-01-09 16:28:19 +01:00
parent 9d003f2cbe
commit e26ed3eb33
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy.sh
+4 -4
View File
@@ -606,13 +606,13 @@ nix_generation() {
cp -avu templates/nix-config/misc/* final-nix-config/etc/nixos/misc/
echo -e "\n✅ Writing correct ips to configuration.nix..."
envsubst '$HOME_SERVER_IP $HOME_ROUTER_IP $TARGET_INTERFACE' < final-nix-config/etc/nixos/misc/networking.nix > final-nix-config/etc/nixos/misc/networking.nix.tmp
envsubst \$HOME_SERVER_IP,\$HOME_ROUTER_IP,\$TARGET_INTERFACE <final-nix-config/etc/nixos/misc/networking.nix > final-nix-config/etc/nixos/misc/networking.nix.tmp
mv final-nix-config/etc/nixos/misc/networking.nix.tmp final-nix-config/etc/nixos/misc/networking.nix
envsubst '$DOMAIN_NAME $EMAIL_ADDRESS $SENDER_EMAIL_DOMAIN $SENDER_EMAIL_ADDRESS' < final-nix-config/etc/nixos/misc/mail.nix > final-nix-config/etc/nixos/misc/mail.nix.tmp
envsubst \$DOMAIN_NAME,\$EMAIL_ADDRESS,\$SENDER_EMAIL_DOMAIN,\$SENDER_EMAIL_ADDRESS <final-nix-config/etc/nixos/misc/mail.nix > final-nix-config/etc/nixos/misc/mail.nix.tmp
mv final-nix-config/etc/nixos/misc/mail.nix.tmp final-nix-config/etc/nixos/misc/mail.nix
envsubst '$PODMAN_NETWORKS' < final-nix-config/etc/nixos/misc/activation.nix > final-nix-config/etc/nixos/misc/activation.nix.tmp
envsubst \$PODMAN_NETWORKS <final-nix-config/etc/nixos/misc/activation.nix > final-nix-config/etc/nixos/misc/activation.nix.tmp
mv final-nix-config/etc/nixos/misc/activation.nix.tmp final-nix-config/etc/nixos/misc/activation.nix
envsubst '$TRAEFIK_NETWORKS $TRAEFIK_REF_NETWORKS' < final-nix-config/etc/nixos/podman/traefik.nix > final-nix-config/etc/nixos/podman/traefik.nix.tmp
envsubst \$TRAEFIK_NETWORKS,\$TRAEFIK_REF_NETWORKS <final-nix-config/etc/nixos/podman/traefik.nix > final-nix-config/etc/nixos/podman/traefik.nix.tmp
mv final-nix-config/etc/nixos/podman/traefik.nix.tmp final-nix-config/etc/nixos/podman/traefik.nix
if [[ "${TARGET_TPM}" == "true" ]]; then
sed -i "s|# boot.initrd.systemd.tpm2.enable = true;| boot.initrd.systemd.tpm2.enable = true;|" final-nix-config/etc/nixos/configuration.nix
templates/nix-config/misc/mail.nix
+2 -2
View File
@@ -21,12 +21,12 @@ in
smtpServer = lib.mkOption {
description = "The SMTP server address";
type = lib.types.str;
default = "$SENDER_MAIL_DOMAIN";
default = "$SENDER_EMAIL_DOMAIN";
};
smtpUsername = lib.mkOption {
description = "The SMTP username";
type = lib.types.str;
default = "$SENDER_MAIL_ADDRESS";
default = "$SENDER_EMAIL_ADDRESS";
};
smtpPasswordPath = lib.mkOption {
description = "Path to the secret containing SMTP password";