diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-01 12:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 12:01:45 +0000 |
| commit | f636a27dac072c30ef37ce5eb662125bfcf596f7 (patch) | |
| tree | 740d5d036c38f80a1d5b44772611ba05f7304148 /nixos/modules/services/networking | |
| parent | d01fda023b2e04eace9a7c7dbdc88abb5583e5ab (diff) | |
| parent | 809093c51c4c01361dbea442c2d5dfcf3dddf682 (diff) | |
| download | nixpkgs-f636a27dac072c30ef37ce5eb662125bfcf596f7.tar nixpkgs-f636a27dac072c30ef37ce5eb662125bfcf596f7.tar.gz nixpkgs-f636a27dac072c30ef37ce5eb662125bfcf596f7.tar.bz2 nixpkgs-f636a27dac072c30ef37ce5eb662125bfcf596f7.tar.lz nixpkgs-f636a27dac072c30ef37ce5eb662125bfcf596f7.tar.xz nixpkgs-f636a27dac072c30ef37ce5eb662125bfcf596f7.tar.zst nixpkgs-f636a27dac072c30ef37ce5eb662125bfcf596f7.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/i2pd.nix | 16 | ||||
| -rw-r--r-- | nixos/modules/services/networking/murmur.nix | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index e1a31a0c2ee..34fda57b23d 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -222,14 +222,12 @@ let in concatStringsSep "\n" inTunOpts))]; in pkgs.writeText "i2pd-tunnels.conf" opts; - i2pdSh = pkgs.writeScriptBin "i2pd" '' - #!/bin/sh - exec ${cfg.package}/bin/i2pd \ - ${if cfg.address == null then "" else "--host="+cfg.address} \ - --service \ - --conf=${i2pdConf} \ - --tunconf=${tunnelConf} - ''; + i2pdFlags = concatStringsSep " " ( + optional (cfg.address != null) ("--host=" + cfg.address) ++ [ + "--service" + ("--conf=" + i2pdConf) + ("--tunconf=" + tunnelConf) + ]); in @@ -686,7 +684,7 @@ in User = "i2pd"; WorkingDirectory = homeDir; Restart = "on-abort"; - ExecStart = "${i2pdSh}/bin/i2pd"; + ExecStart = "${cfg.package}/bin/i2pd ${i2pdFlags}"; }; }; }; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index bbbe1e181bb..992678c43eb 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -294,7 +294,7 @@ in systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target "]; + after = [ "network-online.target" ]; preStart = '' ${pkgs.envsubst}/bin/envsubst \ -o /run/murmur/murmurd.ini \ |