diff --git a/machines/raven/services/wekan.nix b/machines/raven/services/wekan.nix index ed93b14..774b31a 100644 --- a/machines/raven/services/wekan.nix +++ b/machines/raven/services/wekan.nix @@ -2,6 +2,7 @@ let serviceName = "wekan"; databaseName = "wekandb"; + networkName = "wekan-tier"; port = 8001; domain = "wekan.fablab-nea.de"; url = "https://${domain}"; @@ -37,7 +38,9 @@ in "/etc/localtime:/etc/localtime:ro" "${directories.data}:/data:rw" ]; - extraOptions = [ "--network=wekan-tier" ]; + extraOptions = [ + "--network=${networkName}" + ]; }; "${databaseName}" = { autoStart = true; @@ -49,14 +52,16 @@ in "${directories.db}:/data/db" "${directories.dbDump}:/dump" ]; - extraOptions = [ "--network=wekan-tier" ]; + extraOptions = [ + "--network=${networkName}" + ]; }; }; }; - # Create the wekan-tier netowrk + # Create the netowrk systemd.services.init-filerun-network-and-files = { - description = "Create the network bridge wekan-tier for WeKan."; + description = "Create the network bridge ${networkName} for WeKan."; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -64,11 +69,10 @@ in script = let podmancli = "${pkgs.podman}/bin/podman"; in '' - check=$(${podmancli} network ls | grep "wekan-tier" || true) - if [ -z "$check" ]; then - ${podmancli} network create wekan-tier + if ! ${podmancli} network ls --format '{{ .Name }}' | grep -qFx -- "${networkName}"; then + ${podmancli} network create "${networkName}" else - echo "wekan-tier already exists" + echo "network already exists" fi ''; };