Merge pull request #63204 from michaelpj/imp/localtime-upstream

localtime: use upstream unit, fix polkit rules
This commit is contained in:
worldofpeace
2019-06-19 08:38:03 -04:00
committed by GitHub
2 changed files with 15 additions and 30 deletions
+7 -24
View File
@@ -28,33 +28,16 @@ in {
};
};
# so polkit will pick up the rules
environment.systemPackages = [ pkgs.localtime ];
users.users = [{
name = "localtimed";
description = "Taskserver user";
}];
# We use the 'out' output, since localtime has its 'bin' output
# first, so that is what we get if we use the derivation bare.
# Install the polkit rules.
environment.systemPackages = [ pkgs.localtime.out ];
# Install the systemd unit.
systemd.packages = [ pkgs.localtime.out ];
systemd.services.localtime = {
description = "localtime service";
wantedBy = [ "multi-user.target" ];
partOf = [ "geoclue.service "];
serviceConfig = {
Restart = "on-failure";
# TODO: make it work with dbus
#DynamicUser = true;
Nice = 10;
User = "localtimed";
PrivateTmp = "yes";
PrivateDevices = true;
PrivateNetwork = "yes";
NoNewPrivileges = "yes";
ProtectSystem = "strict";
ProtectHome = true;
ExecStart = "${pkgs.localtime}/bin/localtimed";
};
serviceConfig.Restart = "on-failure";
};
};
}