diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2018-03-28 08:32:29 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2018-03-28 10:34:57 +0300 |
| commit | 33c34aff2fb42268f45c5563f767266e27c58a9b (patch) | |
| tree | fb009e45b2a4c445d0f3742914f40fd63149364c /nixos/modules/services/networking/iodine.nix | |
| parent | 276d10dae6b14e457c8206e9e292ce8341434520 (diff) | |
| download | nixpkgs-33c34aff2fb42268f45c5563f767266e27c58a9b.tar nixpkgs-33c34aff2fb42268f45c5563f767266e27c58a9b.tar.gz nixpkgs-33c34aff2fb42268f45c5563f767266e27c58a9b.tar.bz2 nixpkgs-33c34aff2fb42268f45c5563f767266e27c58a9b.tar.lz nixpkgs-33c34aff2fb42268f45c5563f767266e27c58a9b.tar.xz nixpkgs-33c34aff2fb42268f45c5563f767266e27c58a9b.tar.zst nixpkgs-33c34aff2fb42268f45c5563f767266e27c58a9b.zip | |
hans, iodine: correct script
Diffstat (limited to 'nixos/modules/services/networking/iodine.nix')
| -rw-r--r-- | nixos/modules/services/networking/iodine.nix | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 66569a7e912..709c36ee54f 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -120,18 +120,10 @@ in description = "iodine client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - cat > /run/iodine/${name}-script << EOF - #!/bin/sh - ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server} - EOF - chmod 700 /run/iodine/${name}-script - ''; - script = "/run/iodine/${name}-script"; + script = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; - RuntimeDirectory = [ "iodine" ]; }; }; in @@ -144,15 +136,7 @@ in description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - cat > /run/iodined/script << EOF - #!/bin/sh - ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain} - EOF - chmod 700 /run/iodined/script - ''; - script = "/run/iodined/script"; - serviceConfig.RuntimeDirectory = [ "iodined" ]; + script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}"; }; }; |