diff options
| author | Domen Kožar <domen@dev.si> | 2013-10-28 08:26:19 -0700 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2013-10-28 08:26:19 -0700 |
| commit | f58a1f5c9803bab967e146b115363b4d44ead309 (patch) | |
| tree | c02fce6f9fbaeb1378b8fd0b3835212587cfa0f8 | |
| parent | 04fc38d23391aa92d92a7a5fe0682511c392d4ff (diff) | |
| parent | d28a9619a1d48b0885a027aa0ad976966f7778eb (diff) | |
| download | nixlib-f58a1f5c9803bab967e146b115363b4d44ead309.tar nixlib-f58a1f5c9803bab967e146b115363b4d44ead309.tar.gz nixlib-f58a1f5c9803bab967e146b115363b4d44ead309.tar.bz2 nixlib-f58a1f5c9803bab967e146b115363b4d44ead309.tar.lz nixlib-f58a1f5c9803bab967e146b115363b4d44ead309.tar.xz nixlib-f58a1f5c9803bab967e146b115363b4d44ead309.tar.zst nixlib-f58a1f5c9803bab967e146b115363b4d44ead309.zip | |
Merge pull request #1137 from offlinehacker/nixos/redis/fix_user_syslog
nixos/redis: user set uid, log to syslog by default
| -rw-r--r-- | nixos/modules/misc/ids.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/databases/redis.nix | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index adaa2b0d9aee..66f04668a706 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -102,6 +102,7 @@ tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice. zope2 = 94; firebird = 95; + redis = 96; # When adding a uid, make sure it doesn't match an existing gid. diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 5bc58c73bd61..ea6399ba4f44 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -14,6 +14,7 @@ let ${condOption "unixsocket" cfg.unixSocket} loglevel ${cfg.logLevel} logfile ${cfg.logfile} + syslog-enabled ${redisBool cfg.syslog} databases ${toString cfg.databases} ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save} dbfilename ${cfg.dbFilename} @@ -82,12 +83,18 @@ in }; logfile = mkOption { - default = "stdout"; + default = "/dev/null"; description = "Specify the log file name. Also 'stdout' can be used to force Redis to log on the standard output."; example = "/var/log/redis.log"; type = with types; string; }; + syslog = mkOption { + default = true; + description = "Enable logging to the system logger."; + type = with types; bool; + }; + databases = mkOption { default = 16; description = "Set the number of databases."; @@ -177,8 +184,9 @@ in config = mkIf config.services.redis.enable { - users.extraUsers = singleton + users.extraUsers.redis = { name = cfg.user; + uid = config.ids.uids.redis; description = "Redis database user"; }; |