diff options
author | Lassulus <github@lassul.us> | 2019-04-27 15:45:30 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-27 15:45:30 +0900 |
commit | 21fe4fd17677412ea9fcd8c2198baeff83b2edd3 (patch) | |
tree | cf130bad413b3d6da3a63cf3b57cd3409626cd10 /nixos | |
parent | d7d8743e20df36fae7c1cfed2bd98d166ae3cc09 (diff) | |
parent | 58f682742e4d45e33cb0ae813d6dd5c5c9d9cb9c (diff) | |
download | nixpkgs-21fe4fd17677412ea9fcd8c2198baeff83b2edd3.tar nixpkgs-21fe4fd17677412ea9fcd8c2198baeff83b2edd3.tar.gz nixpkgs-21fe4fd17677412ea9fcd8c2198baeff83b2edd3.tar.bz2 nixpkgs-21fe4fd17677412ea9fcd8c2198baeff83b2edd3.tar.lz nixpkgs-21fe4fd17677412ea9fcd8c2198baeff83b2edd3.tar.xz nixpkgs-21fe4fd17677412ea9fcd8c2198baeff83b2edd3.tar.zst nixpkgs-21fe4fd17677412ea9fcd8c2198baeff83b2edd3.zip |
Merge pull request #58181 from fgaz/nixos/zeronet/fix1
nixos/zeronet: add fileserverPort option
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/zeronet.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index 8b60799891c..611a51c74ce 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -5,13 +5,15 @@ let zConfFile = pkgs.writeTextFile { name = "zeronet.conf"; - + text = '' [global] data_dir = ${cfg.dataDir} log_dir = ${cfg.logDir} '' + lib.optionalString (cfg.port != null) '' ui_port = ${toString cfg.port} + '' + lib.optionalString (cfg.fileserverPort != null) '' + fileserver_port = ${toString cfg.fileserverPort} '' + lib.optionalString (cfg.torAlways) '' tor = always '' + cfg.extraConfig; @@ -41,6 +43,15 @@ in with lib; { description = "Optional zeronet web UI port."; }; + fileserverPort = mkOption { + # Not optional: when absent zeronet tries to write one to the + # read-only config file and crashes + type = types.int; + default = 12261; + example = 12261; + description = "Zeronet fileserver port."; + }; + tor = mkOption { type = types.bool; default = false; |