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

Finally fixed podman networks creation on boot. Made it more robust.

Browse Source
This commit is contained in:
Raphaël Numbus
2026-01-09 15:28:32 +01:00
parent fed607a988
commit 92fa21df1f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy.sh
+3 -3
View File
@@ -391,7 +391,7 @@ services_generation() {
if [[ "${service}" == "nextcloud" ]]; then if [[ "${service}" == "nextcloud" ]]; then
j=$((j + 1)) j=$((j + 1))
cp templates/nix-config/podman/${service}.nix final-nix-config/etc/nixos/podman/${service}.nix cp templates/nix-config/podman/${service}.nix final-nix-config/etc/nixos/podman/${service}.nix
PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network create --driver=\"bridge\" --subnet=\"172.16.${j}0.0/24\" --ip-range=\"172.16.${j}0.0/24\" --gateway=\"172.16.${j}0.254\" \"nextcloud-aio\""$'\n' PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network exists \"nextcloud-aio\" || \${pkgs.podman}/bin/podman network create --driver=\"bridge\" --subnet=\"172.16.${j}0.0/24\" --ip-range=\"172.16.${j}0.0/24\" --gateway=\"172.16.${j}0.254\" \"nextcloud-aio\""$'\n'
TRAEFIK_NETWORKS+=" nextcloud-aio:"$'\n' TRAEFIK_NETWORKS+=" nextcloud-aio:"$'\n'
TRAEFIK_NETWORKS+=" ipv4_address: 172.16.${j}0.253"$'\n' TRAEFIK_NETWORKS+=" ipv4_address: 172.16.${j}0.253"$'\n'
TRAEFIK_REF_NETWORKS+=" nextcloud-aio:"$'\n' TRAEFIK_REF_NETWORKS+=" nextcloud-aio:"$'\n'
@@ -401,8 +401,8 @@ services_generation() {
else else
j=$((j + 1)) j=$((j + 1))
cp templates/nix-config/podman/${service}.nix final-nix-config/etc/nixos/podman/${service}.nix cp templates/nix-config/podman/${service}.nix final-nix-config/etc/nixos/podman/${service}.nix
PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network create --driver=\"bridge\" --subnet=\"172.16.${j}.0/24\" --ip-range=\"172.16.${j}.0/24\" --gateway=\"172.16.${j}.254\" \"${service}_backend\""$'\n' PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network exists \"${service}_backend\" || \${pkgs.podman}/bin/podman network create --driver=\"bridge\" --subnet=\"172.16.${j}.0/24\" --ip-range=\"172.16.${j}.0/24\" --gateway=\"172.16.${j}.254\" \"${service}_backend\""$'\n'
PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network create --driver=\"bridge\" --subnet=\"172.16.${j}0.0/24\" --ip-range=\"172.16.${j}0.0/24\" --gateway=\"172.16.${j}0.254\" \"${service}_frontend\""$'\n' PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network exists \"${service}_frontend\" || \${pkgs.podman}/bin/podman network create --driver=\"bridge\" --subnet=\"172.16.${j}0.0/24\" --ip-range=\"172.16.${j}0.0/24\" --gateway=\"172.16.${j}0.254\" \"${service}_frontend\""$'\n'
TRAEFIK_NETWORKS+=" ${service}_frontend:"$'\n' TRAEFIK_NETWORKS+=" ${service}_frontend:"$'\n'
TRAEFIK_NETWORKS+=" ipv4_address: 172.16.${j}0.253"$'\n' TRAEFIK_NETWORKS+=" ipv4_address: 172.16.${j}0.253"$'\n'
TRAEFIK_REF_NETWORKS+=" ${service}_frontend:"$'\n' TRAEFIK_REF_NETWORKS+=" ${service}_frontend:"$'\n'
templates/nix-config/misc/activation.nix
+3 -2
View File
@@ -16,11 +16,11 @@
exit 0 exit 0
fi fi
${pkgs.coreutils}/bin/mkdir -p /mnt/config/ /mnt/data/ ${pkgs.coreutils}/bin/mkdir -p /mnt/config/ /mnt/data/ /home/numbus-admin/.numbus-server/
${pkgs.coreutils}/bin/chown -R numbus-admin:users /mnt/config/ ${pkgs.coreutils}/bin/chown -R numbus-admin:users /mnt/config/
${pkgs.coreutils}/bin/chown -R numbus-admin:users /mnt/data/ ${pkgs.coreutils}/bin/chown -R numbus-admin:users /mnt/data/
${pkgs.coreutils}/bin/chown -R numbus-admin:users /home/numbus-admin/.numbus-server/
${pkgs.coreutils}/bin/mkdir -p /home/numbus-admin/.numbus-server/
${pkgs.coreutils}/bin/touch /home/numbus-admin/.numbus-server/chowned.true ${pkgs.coreutils}/bin/touch /home/numbus-admin/.numbus-server/chowned.true
''; '';
}; };
@@ -28,6 +28,7 @@
systemd.services.numbus-activation-networked = { systemd.services.numbus-activation-networked = {
description = "Numbus-Server activation : Create podman networks"; description = "Numbus-Server activation : Create podman networks";
wantedBy = [ "multi-user.target" "traefik.service" ]; wantedBy = [ "multi-user.target" "traefik.service" ];
before = [ "traefik.service" ];
after = [ "network.target" "local-fs.target" ]; after = [ "network.target" "local-fs.target" ];
serviceConfig = { serviceConfig = {
User = "numbus-admin"; User = "numbus-admin";