diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 11:50:34 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 20:30:29 +1000 |
| commit | c59c4e358989ce49afd177e6899549fbb8f8bf7f (patch) | |
| tree | 52ab48d31449950028e1dcd461abbb8b58442212 /nixos/modules/services/security | |
| parent | 3f175184904d925ad21bf07b1c783d2977a5a4c5 (diff) | |
| download | nixlib-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar nixlib-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.gz nixlib-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.bz2 nixlib-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.lz nixlib-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.xz nixlib-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.zst nixlib-c59c4e358989ce49afd177e6899549fbb8f8bf7f.zip | |
nixos/*: use $out instead of $bin with buildGoPackage
Diffstat (limited to 'nixos/modules/services/security')
| -rw-r--r-- | nixos/modules/services/security/hologram-agent.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/security/hologram-server.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/security/oauth2_proxy.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index a5087b0a99b4..e37334b3cf5e 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -43,12 +43,12 @@ in { description = "Provide EC2 instance credentials to machines outside of EC2"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; + requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; preStart = '' /run/current-system/sw/bin/rm -fv /run/hologram.sock ''; serviceConfig = { - ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; + ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; }; }; diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index bad02c7440ba..4acf6ae0e218 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -123,7 +123,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; + ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}"; }; }; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 46caadee2042..d5c5437329ea 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -577,7 +577,7 @@ in serviceConfig = { User = "oauth2_proxy"; Restart = "always"; - ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; + ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}"; EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile; }; }; |