Make unitConfig/serviceConfig attribute sets

So instead of:

  boot.systemd.services."foo".serviceConfig =
    ''
      StartLimitInterval=10
      CPUShare=500
    '';

you can say:

  boot.systemd.services."foo".serviceConfig.StartLimitInterval = 10;
  boot.systemd.services."foo".serviceConfig.CPUShare = 500;

This way all unit options are available and users can set/override
options in configuration.nix.

1 files changed, 5 insertions, 6 deletions

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 2b7e4a8e44c7..8c815ddf25f8 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -106,8 +106,8 @@ in
 
     # FIXME: restarting syslog seems to break journal logging.
     boot.systemd.services.syslog =
-      { description = "Syslog daemon";
-      
+      { description = "Syslog Daemon";
+
         requires = [ "syslog.socket" ];
 
         wantedBy = [ "multi-user.target" "syslog.target" ];
@@ -115,11 +115,10 @@ in
         environment.TZ = config.time.timeZone;
 
         serviceConfig =
-          ''
-            ExecStart=${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n
+          { ExecStart = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n";
             # Prevent syslogd output looping back through journald.
-            StandardOutput=null
-          '';
+            StandardOutput = "null";
+          };
       };
 
   };