diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2018-09-11 10:28:32 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-11 10:28:32 +0000 |
commit | e02575b906b3a45f2c60018442d4082976dfd8da (patch) | |
tree | 3b8e6a925488b1f869586acbbc96c5d14f030978 /nixos/modules/services/networking | |
parent | 1bdba70b716e6c7899e302a44715782981f675bb (diff) | |
parent | 9c97f37761a5eaa7387aabcd2c3cc631a2b712a3 (diff) | |
download | nixlib-e02575b906b3a45f2c60018442d4082976dfd8da.tar nixlib-e02575b906b3a45f2c60018442d4082976dfd8da.tar.gz nixlib-e02575b906b3a45f2c60018442d4082976dfd8da.tar.bz2 nixlib-e02575b906b3a45f2c60018442d4082976dfd8da.tar.lz nixlib-e02575b906b3a45f2c60018442d4082976dfd8da.tar.xz nixlib-e02575b906b3a45f2c60018442d4082976dfd8da.tar.zst nixlib-e02575b906b3a45f2c60018442d4082976dfd8da.zip |
Merge pull request #46381 from Chiiruno/dev/zeronet
nixos/zeronet: Fix TOR permissions, add torAlways option
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/zeronet.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index 2377cb2c8f11..8b60799891ca 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -12,6 +12,8 @@ let log_dir = ${cfg.logDir} '' + lib.optionalString (cfg.port != null) '' ui_port = ${toString cfg.port} + '' + lib.optionalString (cfg.torAlways) '' + tor = always '' + cfg.extraConfig; }; in with lib; { @@ -35,13 +37,19 @@ in with lib; { port = mkOption { type = types.nullOr types.int; default = null; - example = 15441; - description = "Optional zeronet port."; + example = 43110; + description = "Optional zeronet web UI port."; }; tor = mkOption { type = types.bool; default = false; + description = "Use TOR for zeronet traffic where possible."; + }; + + torAlways = mkOption { + type = types.bool; + default = false; description = "Use TOR for all zeronet traffic."; }; @@ -60,9 +68,13 @@ in with lib; { services.tor = mkIf cfg.tor { enable = true; controlPort = 9051; - extraConfig = "CookieAuthentication 1"; + extraConfig = '' + CacheDirectoryGroupReadable 1 + CookieAuthentication 1 + CookieAuthFileGroupReadable 1 + ''; }; - + systemd.services.zeronet = { description = "zeronet"; after = [ "network.target" (optionalString cfg.tor "tor.service") ]; |