diff options
author | Bernardo Meurer <bernardo@meurer.org> | 2022-08-12 22:23:20 -0400 |
---|---|---|
committer | Bernardo Meurer <bernardo@meurer.org> | 2022-08-12 22:46:16 -0400 |
commit | 5975411744eb1e46bf07a3e1d08ab0c3ae0b432b (patch) | |
tree | 39942a96a537b1fc9aea4943c0048ebcd364e114 /nixos | |
parent | 83bcf0cef149dda31307be53e6ab001a9ef74417 (diff) |
nixos/localtimed: fix service
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/misc/ids.nix | 2 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/system/localtime.nix | 37 | ||||
-rw-r--r-- | nixos/modules/services/system/localtimed.nix | 66 |
4 files changed, 69 insertions, 38 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e3d7866cabb51..38ab338aa56cd 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -354,6 +354,7 @@ in webdav = 322; pipewire = 323; rstudio-server = 324; + localtimed = 325; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -662,6 +663,7 @@ in webdav = 322; pipewire = 323; rstudio-server = 324; + localtimed = 325; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6e979561fa032..837bc7635a068 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1023,7 +1023,7 @@ ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix - ./services/system/localtime.nix + ./services/system/localtimed.nix ./services/system/kerberos/default.nix ./services/system/nscd.nix ./services/system/saslauthd.nix diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix deleted file mode 100644 index c80fe366453ee..0000000000000 --- a/nixos/modules/services/system/localtime.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.localtimed; -in { - imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ]; - - options = { - services.localtimed = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable `localtimed`, a simple daemon for keeping the - system timezone up-to-date based on the current location. It uses - geoclue2 to determine the current location. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - services.geoclue2.appConfig.localtimed = { - isAllowed = true; - isSystem = true; - }; - - # Install the polkit rules. - environment.systemPackages = [ pkgs.localtime ]; - # Install the systemd unit. - systemd.packages = [ pkgs.localtime ]; - - systemd.services.localtime.wantedBy = [ "multi-user.target" ]; - }; -} diff --git a/nixos/modules/services/system/localtimed.nix b/nixos/modules/services/system/localtimed.nix new file mode 100644 index 0000000000000..345bdbd8dda01 --- /dev/null +++ b/nixos/modules/services/system/localtimed.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.localtimed; +in { + imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ]; + + options = { + services.localtimed = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable `localtimed`, a simple daemon for keeping the + system timezone up-to-date based on the current location. It uses + geoclue2 to determine the current location. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.geoclue2.appConfig.localtimed = { + isAllowed = true; + isSystem = true; + users = [ (toString config.ids.uids.localtimed) ]; + }; + + # Install the polkit rules. + environment.systemPackages = [ pkgs.localtime ]; + + systemd.services.localtimed = { + wantedBy = [ "multi-user.target" ]; + partOf = [ "localtimed-geoclue-agent.service" ]; + after = [ "localtimed-geoclue-agent.service" ]; + serviceConfig = { + ExecStart = "${pkgs.localtime}/bin/localtimed"; + Restart = "on-failure"; + Type = "exec"; + User = "localtimed"; + }; + }; + + systemd.services.localtimed-geoclue-agent = { + wantedBy = [ "multi-user.target" ]; + partOf = [ "geoclue.service" ]; + after = [ "geoclue.service" ]; + serviceConfig = { + ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"; + Restart = "on-failure"; + Type = "exec"; + User = "localtimed"; + }; + }; + + users = { + users.localtimed = { + uid = config.ids.uids.localtimed; + group = "localtimed"; + }; + groups.localtimed.gid = config.ids.gids.localtimed; + }; + }; +} |