Commit87547cc

committed

Use attrsOf instead of loaOf

1 parent05701ee commit87547ccCopy full SHA for 87547cc

File tree

+17

-32

lines changed

+17

-32

lines changed

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,16 +88,14 @@ in {`
`88`	`88`
`89`	`89`	`config=mkIfcfg.enable{`
`90`	`90`
`91`		`-users.extraUsers=optionalAttrs(cfg.user=="opendkim")(singleton`
`92`		`-{name="opendkim";`
`93`		`-group=cfg.group;`
	`91`	`+users.extraUsers=optionalAttrs(cfg.user=="opendkim"){opendkim=`
	`92`	`+{group=cfg.group;`
`94`	`93`	`uid=config.ids.uids.opendkim;`
`95`		`-});`
	`94`	`+};};`
`96`	`95`
`97`		`-users.extraGroups=optionalAttrs(cfg.group=="opendkim")(singleton`
`98`		`-{name="opendkim";`
`99`		`-gid=config.ids.gids.opendkim;`
`100`		`-});`
	`96`	`+users.extraGroups=optionalAttrs(cfg.group=="opendkim"){opendkim=`
	`97`	`+{gid=config.ids.gids.opendkim;`
	`98`	`+};};`
`101`	`99`
`102`	`100`	`environment.systemPackages=[pkgs.opendkim];`
`103`	`101`

Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -666,10 +666,7 @@ in`
`666`	`666`	`{`
`667`	`667`
`668`	`668`	`environment={`
`669`		`-etc=singleton`
`670`		`-{source="/var/lib/postfix/conf";`
`671`		`-target="postfix";`
`672`		`-};`
	`669`	`+etc={postfix.source="/var/lib/postfix/conf";};`
`673`	`670`
`674`	`671`	`# This makes comfortable for root to run 'postqueue' for example.`
`675`	`672`	`systemPackages=[pkgs.postfix];`
`@@ -685,22 +682,17 @@ in`
`685`	`682`	`setgid=true;`
`686`	`683`	`};`
`687`	`684`
`688`		`-users.extraUsers=optional(user=="postfix")`
`689`		`-{name="postfix";`
`690`		`-description="Postfix mail server user";`
	`685`	`+users.extraUsers=optionalAttrs(user=="postfix"){postfix=`
	`686`	`+{description="Postfix mail server user";`
`691`	`687`	`uid=config.ids.uids.postfix;`
`692`	`688`	`group=group;`
`693`		`-};`
	`689`	`+};};`
`694`	`690`
`695`	`691`	`users.extraGroups=`
`696`		`-optional(group=="postfix")`
`697`		`-{name=group;`
`698`		`-gid=config.ids.gids.postfix;`
`699`		`-}`
`700`		`-++optional(setgidGroup=="postdrop")`
`701`		`-{name=setgidGroup;`
`702`		`-gid=config.ids.gids.postdrop;`
`703`		`-};`
	`692`	`+optionalAttrs(group=="postfix")`
	`693`	`+{"${group}".gid=config.ids.gids.postfix;}`
	`694`	`+//optionalAttrs(setgidGroup=="postdrop")`
	`695`	`+{"${setgidGroup}".gid=config.ids.gids.postdrop;};`
`704`	`696`
`705`	`697`	`systemd.services.postfix=`
`706`	`698`	`{description="Postfix mail server";`

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -393,14 +393,9 @@ in`
`393`	`393`	`};`
`394`	`394`
`395`	`395`
`396`		`-users.extraUsers=(singleton`
`397`		`-{name="${user}";`
`398`		`-group="${group}";`
`399`		`-});`
`400`		`-`
`401`		`-users.extraGroups=(singleton`
`402`		`-{name="${user}";`
`403`		`-});`
	`396`	`+users.extraUsers."${user}".group="${group}";`
	`397`	`+`
	`398`	`+users.extraGroups."${user}"={};`
`404`	`399`
`405`	`400`	`nixcloud.tests.wanted=[./test.nix];`
`406`	`401`	`};`

Comments

(0)