change podman building

modules/server/containers/default.nix

@@ -3,8 +3,11 @@ let
   cfg = config.syscfg.server.containers;
   enabledConfigs = lib.filterAttrs (name: c: c.enable) cfg;
   containerSetsList = lib.mapAttrsToList (name: containerCfg:
-    import (./defs + "/${name}.nix") {
-      inherit config pkgs lib  containerCfg;
+  let defs = import (./defs + "/${name}.nix") {inherit config pkgs lib containerCfg;};
+  in{
+    containers = lib.mapAttrs' (cName: cValue: 
+      lib.nameValuePair "${name}-${cName}" cValue
+    ) defs.containers;
   }
 ) enabledConfigs;
   mergedContainers = lib.attrsets.mergeAttrsList  (lib.map(e: e.containers) containerSetsList);

modules/server/containers/defs/authentik.nix

@@ -14,9 +14,8 @@ in {
 
   containers = {
 
-    auth_server = {
+    server = {
       image = "ghcr.io/goauthentik/server:latest";
-      hostname = "auth_server";
       volumes = [
         "${serverCfg.dataPath}/authentik/media:/media"
         "${serverCfg.dataPath}/authentik/templates:/templates"
@@ -47,8 +46,6 @@ in {
       cmd = [ "server" ];
       extraOptions = [
         "--add-host=host.containers.internal:host-gateway"
-        "--replace"
-        "--rm"
         "--ip=${containerCfg.ip}"
       ];
       ports = [
@@ -56,9 +53,8 @@ in {
       ];
     };
 
-    auth_worker = {
+    worker = {
       image = "ghcr.io/goauthentik/server:latest";
-      hostname = "auth_worker";
       volumes = [
         "${serverCfg.dataPath}/authentik/media:/media"
         "${serverCfg.dataPath}/authentik/templates:/templates"
@@ -75,8 +71,6 @@ in {
       };
       extraOptions = [
         "--add-host=host.containers.internal:host-gateway"
-        "--replace"
-        "--rm"
       ];
       cmd = [ "worker" ];
     };