diff options
| author | tv <tv@krebsco.de> | 2016-11-11 08:49:37 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-11-11 08:49:37 +0100 |
| commit | 0e13a4e2373d891e6a895e4b6ad2b42da028ba12 (patch) | |
| tree | 1d8ca040ab86b462d6e3fd283997d56177fa4b33 /krebs | |
| parent | b837dec290e54f532cd5539c93a663ba11f68c54 (diff) | |
| parent | e6c7b13f5990d96e269ee12b9bf6b15bfa7d5b82 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/exim-smarthost.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/go.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/go-shortener/default.nix (renamed from krebs/5pkgs/go/default.nix) | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/go-shortener/packages.nix (renamed from krebs/5pkgs/go/packages.nix) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index 2ed5607f1..c96b14723 100644 --- a/krebs/3modules/exim-smarthost.nix +++ b/krebs/3modules/exim-smarthost.nix @@ -246,12 +246,12 @@ let remote_smtp: driver = smtp - ${optionalString (cfg.dkim != []) '' + ${optionalString (cfg.dkim != []) (indent '' dkim_canon = relaxed dkim_domain = $sender_address_domain dkim_private_key = ''${lookup{$sender_address_domain}lsearch{${lsearch.dkim_private_key}}} dkim_selector = ''${lookup{$sender_address_domain}lsearch{${lsearch.dkim_selector}}} - ''} + '')} helo_data = ''${if eq{$acl_m_special_dom}{} \ {$primary_hostname} \ {$acl_m_special_dom} } diff --git a/krebs/3modules/go.nix b/krebs/3modules/go.nix index a86f444dc..218ac9221 100644 --- a/krebs/3modules/go.nix +++ b/krebs/3modules/go.nix @@ -44,7 +44,7 @@ let wantedBy = [ "multi-user.target" ]; path = with pkgs; [ - go + go-shortener ]; environment = { @@ -57,7 +57,7 @@ let serviceConfig = { User = "go"; Restart = "always"; - ExecStart = "${pkgs.go}/bin/go"; + ExecStart = "${pkgs.go-shortener}/bin/go"; }; }; }; diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go-shortener/default.nix index 2871e5a99..996f7072a 100644 --- a/krebs/5pkgs/go/default.nix +++ b/krebs/5pkgs/go-shortener/default.nix @@ -19,7 +19,7 @@ let }; in np.buildNodePackage { - name = "go"; + name = "go-shortener"; src = fetchgit { url = "http://cgit.lassul.us/go/"; diff --git a/krebs/5pkgs/go/packages.nix b/krebs/5pkgs/go-shortener/packages.nix index 9acfd7658..9acfd7658 100644 --- a/krebs/5pkgs/go/packages.nix +++ b/krebs/5pkgs/go-shortener/packages.nix |