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

Made huge replacements more robust with envsubst instead of sed

Browse Source
This commit is contained in:
Raphaël Numbus
2026-01-09 16:18:59 +01:00
parent 491c56909e
commit 9d003f2cbe
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy.sh
+8 -10
View File
@@ -606,16 +606,14 @@ nix_generation() {
cp -avu templates/nix-config/misc/* final-nix-config/etc/nixos/misc/ cp -avu templates/nix-config/misc/* final-nix-config/etc/nixos/misc/
echo -e "\n✅ Writing correct ips to configuration.nix..." echo -e "\n✅ Writing correct ips to configuration.nix..."
sed -i "s|HOME_SERVER_IP|${HOME_SERVER_IP}|g" final-nix-config/etc/nixos/misc/networking.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
sed -i "s|HOME_ROUTER_IP|${HOME_ROUTER_IP}|g" final-nix-config/etc/nixos/misc/networking.nix mv final-nix-config/etc/nixos/misc/networking.nix.tmp final-nix-config/etc/nixos/misc/networking.nix
sed -i "s|TARGET_INTERFACE|${TARGET_INTERFACE}|g" 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
sed -i "s|DOMAIN_NAME|${DOMAIN_NAME}|g" final-nix-config/etc/nixos/misc/mail.nix mv final-nix-config/etc/nixos/misc/mail.nix.tmp final-nix-config/etc/nixos/misc/mail.nix
sed -i "s|EMAIL_ADDRESS|${EMAIL_ADDRESS}|g" 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
sed -i "s|SENDER_MAIL_DOMAIN|${SENDER_EMAIL_DOMAIN}|g" final-nix-config/etc/nixos/misc/mail.nix mv final-nix-config/etc/nixos/misc/activation.nix.tmp final-nix-config/etc/nixos/misc/activation.nix
sed -i "s|SENDER_MAIL_ADDRESS|${SENDER_EMAIL_ADDRESS}|g" final-nix-config/etc/nixos/misc/mail.nix envsubst '$TRAEFIK_NETWORKS $TRAEFIK_REF_NETWORKS' < final-nix-config/etc/nixos/podman/traefik.nix > final-nix-config/etc/nixos/podman/traefik.nix.tmp
sed -i "s|PODMAN_NETWORKS|${PODMAN_NETWORKS//$'\n'/\\n}|" final-nix-config/etc/nixos/misc/activation.nix mv final-nix-config/etc/nixos/podman/traefik.nix.tmp final-nix-config/etc/nixos/podman/traefik.nix
sed -i "s|TRAEFIK_NETWORKS|${TRAEFIK_NETWORKS//$'\n'/\\n}|" final-nix-config/etc/nixos/podman/traefik.nix
sed -i "s|TRAEFIK_REF_NETWORKS|${TRAEFIK_REF_NETWORKS//$'\n'/\\n}|" final-nix-config/etc/nixos/podman/traefik.nix
if [[ "${TARGET_TPM}" == "true" ]]; then 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 sed -i "s|# boot.initrd.systemd.tpm2.enable = true;| boot.initrd.systemd.tpm2.enable = true;|" final-nix-config/etc/nixos/configuration.nix
sed -i "s|# ./disks/pcr-check.nix| ./disks/pcr-check.nix|" final-nix-config/etc/nixos/configuration.nix sed -i "s|# ./disks/pcr-check.nix| ./disks/pcr-check.nix|" final-nix-config/etc/nixos/configuration.nix
templates/nix-config/misc/activation.nix
+1 -1
View File
@@ -43,7 +43,7 @@
exit 0 exit 0
fi fi
PODMAN_NETWORKS $PODMAN_NETWORKS
${pkgs.coreutils}/bin/mkdir -p /home/numbus-admin/.numbus-server/ ${pkgs.coreutils}/bin/mkdir -p /home/numbus-admin/.numbus-server/
${pkgs.coreutils}/bin/touch /home/numbus-admin/.numbus-server/networked.true ${pkgs.coreutils}/bin/touch /home/numbus-admin/.numbus-server/networked.true
templates/nix-config/misc/mail.nix
+4 -4
View File
@@ -11,22 +11,22 @@ in
fromAddress = lib.mkOption { fromAddress = lib.mkOption {
description = "The 'from' address"; description = "The 'from' address";
type = lib.types.str; type = lib.types.str;
default = "no-reply@DOMAIN_NAME"; default = "no-reply@$DOMAIN_NAME";
}; };
toAddress = lib.mkOption { toAddress = lib.mkOption {
description = "The 'to' address"; description = "The 'to' address";
type = lib.types.str; type = lib.types.str;
default = "EMAIL_ADDRESS"; default = "$EMAIL_ADDRESS";
}; };
smtpServer = lib.mkOption { smtpServer = lib.mkOption {
description = "The SMTP server address"; description = "The SMTP server address";
type = lib.types.str; type = lib.types.str;
default = "SENDER_MAIL_DOMAIN"; default = "$SENDER_MAIL_DOMAIN";
}; };
smtpUsername = lib.mkOption { smtpUsername = lib.mkOption {
description = "The SMTP username"; description = "The SMTP username";
type = lib.types.str; type = lib.types.str;
default = "SENDER_MAIL_ADDRESS"; default = "$SENDER_MAIL_ADDRESS";
}; };
smtpPasswordPath = lib.mkOption { smtpPasswordPath = lib.mkOption {
description = "Path to the secret containing SMTP password"; description = "Path to the secret containing SMTP password";
templates/nix-config/misc/networking.nix
+4 -4
View File
@@ -11,15 +11,15 @@
networking.firewall.enable = true; networking.firewall.enable = true;
# Bridge configuration for VMs # Bridge configuration for VMs
networking.bridges.br0.interfaces = [ "TARGET_INTERFACE" ]; networking.bridges.br0.interfaces = [ "$TARGET_INTERFACE" ];
networking.interfaces.br0.useDHCP = false; networking.interfaces.br0.useDHCP = false;
networking.nameservers = [ "HOME_SERVER_IP" "9.9.9.9" ]; networking.nameservers = [ "$HOME_SERVER_IP" "9.9.9.9" ];
networking.interfaces.br0.ipv4.addresses = [{ networking.interfaces.br0.ipv4.addresses = [{
address = "HOME_SERVER_IP"; address = "$HOME_SERVER_IP";
prefixLength = 24; prefixLength = 24;
}]; }];
networking.defaultGateway = { networking.defaultGateway = {
address = "HOME_ROUTER_IP"; address = "$HOME_ROUTER_IP";
interface = "br0"; interface = "br0";
}; };
templates/nix-config/podman/traefik.nix
+2 -2
View File
@@ -18,7 +18,7 @@ in
image: docker.io/library/traefik:latest image: docker.io/library/traefik:latest
container_name: traefik container_name: traefik
networks: networks:
TRAEFIK_NETWORKS $TRAEFIK_NETWORKS
ports: ports:
- 8080:80 - 8080:80
- 8443:443 - 8443:443
@@ -39,7 +39,7 @@ TRAEFIK_NETWORKS
- traefik.http.routers.traefik-https.tls.certresolver=cloudflare - traefik.http.routers.traefik-https.tls.certresolver=cloudflare
restart: always restart: always
networks: networks:
TRAEFIK_REF_NETWORKS $TRAEFIK_REF_NETWORKS
''; '';
systemd.services.traefik = { systemd.services.traefik = {