diff options
author | Robin Gloster <mail@glob.in> | 2016-01-06 06:50:18 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-01-07 06:39:06 +0000 |
commit | 88292fdf09960e9cb8e3c063a6b95ac4284222ec (patch) | |
tree | 34ff267ed7bacf9fd906b1736476b431e9afe909 /nixos/modules/services/system | |
parent | af50b03f50d88954e98018c7c18c0581928b7165 (diff) | |
download | nixpkgs-88292fdf09960e9cb8e3c063a6b95ac4284222ec.tar nixpkgs-88292fdf09960e9cb8e3c063a6b95ac4284222ec.tar.gz nixpkgs-88292fdf09960e9cb8e3c063a6b95ac4284222ec.tar.bz2 nixpkgs-88292fdf09960e9cb8e3c063a6b95ac4284222ec.tar.lz nixpkgs-88292fdf09960e9cb8e3c063a6b95ac4284222ec.tar.xz nixpkgs-88292fdf09960e9cb8e3c063a6b95ac4284222ec.tar.zst nixpkgs-88292fdf09960e9cb8e3c063a6b95ac4284222ec.zip |
jobs -> systemd.services
Diffstat (limited to 'nixos/modules/services/system')
-rw-r--r-- | nixos/modules/services/system/kerberos.nix | 33 | ||||
-rw-r--r-- | nixos/modules/services/system/uptimed.nix | 26 |
2 files changed, 25 insertions, 34 deletions
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index 3a0171ca1b9..e0c3f95c3cc 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -45,27 +45,20 @@ in serverArgs = "${pkgs.heimdal}/sbin/kadmind"; }; - jobs.kdc = - { description = "Kerberos Domain Controller daemon"; - - startOn = "ip-up"; - - preStart = - '' - mkdir -m 0755 -p ${stateDir} - ''; - - exec = "${heimdal}/sbin/kdc"; - - }; - - jobs.kpasswdd = - { description = "Kerberos Domain Controller daemon"; - - startOn = "ip-up"; + systemd.services.kdc = { + description = "Kerberos Domain Controller daemon"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -m 0755 -p ${stateDir} + ''; + script = "${heimdal}/sbin/kdc"; + }; - exec = "${heimdal}/sbin/kpasswdd"; - }; + systemd.services.kpasswdd = { + description = "Kerberos Domain Controller daemon"; + wantedBy = [ "multi-user.target" ]; + script = "${heimdal}/sbin/kpasswdd"; + }; }; } diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index ab46c508914..5f8916bbf9a 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -45,23 +45,21 @@ in home = stateDir; }; - jobs.uptimed = - { description = "Uptimed daemon"; + systemd.services.uptimed = { + description = "Uptimed daemon"; + wantedBy = [ "multi-user.target" ]; - startOn = "startup"; + preStart = '' + mkdir -m 0755 -p ${stateDir} + chown ${uptimedUser} ${stateDir} - preStart = - '' - mkdir -m 0755 -p ${stateDir} - chown ${uptimedUser} ${stateDir} + if ! test -f ${stateDir}/bootid ; then + ${uptimed}/sbin/uptimed -b + fi + ''; - if ! test -f ${stateDir}/bootid ; then - ${uptimed}/sbin/uptimed -b - fi - ''; - - exec = "${uptimed}/sbin/uptimed"; - }; + script = "${uptimed}/sbin/uptimed"; + }; }; |