diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-31 16:35:53 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-31 16:35:53 +0100 |
| commit | 555037a6670ba487ec23c3e819a6a2f24dc0a05f (patch) | |
| tree | 55a7fca979cb68a309aab68b202477bb4a783682 /nixos/modules/services | |
| parent | 0c2adc0fb1b0b551bef119477f37b86190cd9cc5 (diff) | |
| parent | e4d0e33f36491a0e08a3b1a15db13366d7d0785f (diff) | |
| download | nixlib-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar nixlib-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.gz nixlib-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.bz2 nixlib-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.lz nixlib-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.xz nixlib-555037a6670ba487ec23c3e819a6a2f24dc0a05f.tar.zst nixlib-555037a6670ba487ec23c3e819a6a2f24dc0a05f.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/torrent/transmission.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index f7a88867b616..aa1acdf7d20b 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -118,7 +118,7 @@ in # 1) Only the "transmission" user and group have access to torrents. # 2) Optionally update/force specific fields into the configuration file. serviceConfig.ExecStartPre = preStart; - serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; + serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port} --config-dir ${settingsDir}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; serviceConfig.User = cfg.user; serviceConfig.Group = cfg.group; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index e3a2db398e62..f1dabadc119a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -62,7 +62,7 @@ in { https = mkOption { type = types.bool; default = false; - description = "Enable if there is a TLS terminating proxy in front of nextcloud."; + description = "Use https for generated links."; }; maxUploadSize = mkOption { |