firefox.syncserver service: No need for configurable user

Changed files
+12 -27
nixos
modules
services
networking
firefox
+12 -27
nixos/modules/services/networking/firefox/sync-server.nix
···
'';
};
-
user = mkOption {
-
type = types.str;
-
default = "syncserver";
-
description = "User account under which syncserver runs.";
-
};
-
-
group = mkOption {
-
type = types.str;
-
default = "syncserver";
-
description = "Group account under which syncserver runs.";
-
};
-
publicUrl = mkOption {
type = types.str;
default = "http://localhost:5000/";
···
systemd.services.syncserver = let
syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]);
+
user = "syncserver";
+
group = "syncserver";
in {
after = [ "network.target" ];
description = "Firefox Sync Server";
···
path = [ pkgs.coreutils syncServerEnv ];
serviceConfig = {
-
User = cfg.user;
-
Group = cfg.group;
+
User = user;
+
Group = group;
PermissionsStartOnly = true;
};
···
echo > ${cfg.privateConfig} '[syncserver]'
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
fi
-
chown ${cfg.user}:${cfg.group} ${cfg.privateConfig}
+
chown ${user}:${group} ${cfg.privateConfig}
'' + optionalString (cfg.sqlUri == defaultSqlUri) ''
if ! test -e $(dirname ${defaultDbLocation}); then
mkdir -m 700 -p $(dirname ${defaultDbLocation})
-
chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation})
+
chown ${user}:${group} $(dirname ${defaultDbLocation})
fi
# Move previous database file if it exists
oldDb="/var/db/firefox-sync-server.db"
if test -f $oldDb; then
mv $oldDb ${defaultDbLocation}
-
chown ${cfg.user}:${cfg.group} ${defaultDbLocation}
+
chown ${user}:${group} ${defaultDbLocation}
fi
'';
serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
};
-
users.extraUsers = optionalAttrs (cfg.user == "syncserver")
-
(singleton {
-
name = "syncserver";
-
group = cfg.group;
-
isSystemUser = true;
-
});
+
users.users.syncserver = {
+
group = "syncserver";
+
isSystemUser = true;
+
};
-
users.extraGroups = optionalAttrs (cfg.group == "syncserver")
-
(singleton {
-
name = "syncserver";
-
});
+
users.groups.syncserver = {};
};
}