public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox.syncserver service: No need for configurable user

Browse Source
This commit is contained in:
Nadrieril 2017-09-27 15:53:12 +01:00
parent d8787a8aac
commit f90b3dcf05
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nixos/modules/services/networking/firefox/sync-server.nix
View File

@ -70,18 +70,6 @@ in
''; '';
}; };
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 { publicUrl = mkOption {
type = types.str; type = types.str;
default = "http://localhost:5000/"; default = "http://localhost:5000/";
@ -138,6 +126,8 @@ in
systemd.services.syncserver = let systemd.services.syncserver = let
syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]); syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]);
user = "syncserver";
group = "syncserver";
in { in {
after = [ "network.target" ]; after = [ "network.target" ];
description = "Firefox Sync Server"; description = "Firefox Sync Server";
@ -145,8 +135,8 @@ in
path = [ pkgs.coreutils syncServerEnv ]; path = [ pkgs.coreutils syncServerEnv ];
serviceConfig = { serviceConfig = {
User = cfg.user; User = user;
Group = cfg.group; Group = group;
PermissionsStartOnly = true; PermissionsStartOnly = true;
}; };
@ -156,32 +146,27 @@ in
echo > ${cfg.privateConfig} '[syncserver]' echo > ${cfg.privateConfig} '[syncserver]'
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
fi fi
chown ${cfg.user}:${cfg.group} ${cfg.privateConfig} chown ${user}:${group} ${cfg.privateConfig}
'' + optionalString (cfg.sqlUri == defaultSqlUri) '' '' + optionalString (cfg.sqlUri == defaultSqlUri) ''
if ! test -e $(dirname ${defaultDbLocation}); then if ! test -e $(dirname ${defaultDbLocation}); then
mkdir -m 700 -p $(dirname ${defaultDbLocation}) mkdir -m 700 -p $(dirname ${defaultDbLocation})
chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation}) chown ${user}:${group} $(dirname ${defaultDbLocation})
fi fi
# Move previous database file if it exists # Move previous database file if it exists
oldDb="/var/db/firefox-sync-server.db" oldDb="/var/db/firefox-sync-server.db"
if test -f $oldDb; then if test -f $oldDb; then
mv $oldDb ${defaultDbLocation} mv $oldDb ${defaultDbLocation}
chown ${cfg.user}:${cfg.group} ${defaultDbLocation} chown ${user}:${group} ${defaultDbLocation}
fi fi
''; '';
serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}"; serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
}; };
users.extraUsers = optionalAttrs (cfg.user == "syncserver") users.users.syncserver = {
(singleton { group = "syncserver";
name = "syncserver"; isSystemUser = true;
group = cfg.group; };
isSystemUser = true;
});
users.extraGroups = optionalAttrs (cfg.group == "syncserver") users.groups.syncserver = {};
(singleton {
name = "syncserver";
});
}; };
} }