about summary refs log tree commit diff
path: root/nixos/modules/services/logging
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-30 11:02:04 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-30 14:57:42 +0100
commit862e3dd977cdd853c3ab3202ab1b73561f8a3ea1 (patch)
tree43e95414e328ac92383bccf41219c30fa9729473 /nixos/modules/services/logging
parent162b874469935923dec02cc9a6b5f58b1c8267a8 (diff)
downloadnixlib-862e3dd977cdd853c3ab3202ab1b73561f8a3ea1.tar
nixlib-862e3dd977cdd853c3ab3202ab1b73561f8a3ea1.tar.gz
nixlib-862e3dd977cdd853c3ab3202ab1b73561f8a3ea1.tar.bz2
nixlib-862e3dd977cdd853c3ab3202ab1b73561f8a3ea1.tar.lz
nixlib-862e3dd977cdd853c3ab3202ab1b73561f8a3ea1.tar.xz
nixlib-862e3dd977cdd853c3ab3202ab1b73561f8a3ea1.tar.zst
nixlib-862e3dd977cdd853c3ab3202ab1b73561f8a3ea1.zip
Substitute "types.uniq types.string" -> "types.str"
Diffstat (limited to 'nixos/modules/services/logging')
-rw-r--r--nixos/modules/services/logging/logcheck.nix18
-rw-r--r--nixos/modules/services/logging/syslogd.nix2
2 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 23f21b6a754d..2a6a6516f488 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -52,7 +52,7 @@ let
 
   levelOption = mkOption {
     default = "server";
-    type = types.uniq types.string;
+    type = types.str;
     description = ''
       Set the logcheck level. Either "workstation", "server", or "paranoid".
     '';
@@ -63,7 +63,7 @@ let
 
     regex = mkOption {
       default = "";
-      type = types.uniq types.string;
+      type = types.str;
       description = ''
         Regex specifying which log lines to ignore.
       '';
@@ -73,7 +73,7 @@ let
   ignoreCronOptions = {
     user = mkOption {
       default = "root";
-      type = types.uniq types.string;
+      type = types.str;
       description = ''
         User that runs the cronjob.
       '';
@@ -81,7 +81,7 @@ let
 
     cmdline = mkOption {
       default = "";
-      type = types.uniq types.string;
+      type = types.str;
       description = ''
         Command line for the cron job. Will be turned into a regex for the logcheck ignore rule.
       '';
@@ -89,7 +89,7 @@ let
 
     timeArgs = mkOption {
       default = null;
-      type = types.nullOr (types.uniq types.string);
+      type = types.nullOr (types.str);
       example = "02 06 * * *";
       description = ''
         "min hr dom mon dow" crontab time args, to auto-create a cronjob too.
@@ -112,7 +112,7 @@ in
 
       user = mkOption {
         default = "logcheck";
-        type = types.uniq types.string;
+        type = types.str;
         description = ''
           Username for the logcheck user.
         '';
@@ -121,7 +121,7 @@ in
       timeOfDay = mkOption {
         default = "*";
         example = "6";
-        type = types.uniq types.string;
+        type = types.str;
         description = ''
           Time of day to run logcheck. A logcheck will be scheduled at xx:02 each day.
           Leave default (*) to run every hour. Of course when nothing special was logged,
@@ -132,7 +132,7 @@ in
       mailTo = mkOption {
         default = "root";
         example = "you@domain.com";
-        type = types.uniq types.string;
+        type = types.str;
         description = ''
           Email address to send reports to.
         '';
@@ -140,7 +140,7 @@ in
 
       level = mkOption {
         default = "server";
-        type = types.uniq types.string;
+        type = types.str;
         description = ''
           Set the logcheck level. Either "workstation", "server", or "paranoid".
         '';
diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix
index 24cd5c1567e7..c1a66aaa3cc6 100644
--- a/nixos/modules/services/logging/syslogd.nix
+++ b/nixos/modules/services/logging/syslogd.nix
@@ -46,7 +46,7 @@ in
       };
 
       tty = mkOption {
-        type = types.uniq types.string;
+        type = types.str;
         default = "tty10";
         description = ''
           The tty device on which syslogd will print important log