diff options
| author | tv <tv@shackspace.de> | 2015-08-28 21:54:35 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-08-28 21:54:35 +0200 |
| commit | e5ecd75ac266a77c31790e52c2ea000574be9e22 (patch) | |
| tree | eecdc35c4a8f257d86178f6eb864c9404a2f1aa7 /krebs/3modules | |
| parent | 62865ae6ae46e006cea7ee80b931fc5be27d3449 (diff) | |
| parent | ecae9b59753c13ea5bff57a6f7c44086c77844d6 (diff) | |
Merge remote-tracking branch 'uriel/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/default.nix | 3 | ||||
| -rw-r--r-- | krebs/3modules/urlwatch.nix | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index f143e64b8..3d34ddf12 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -272,6 +272,7 @@ let ''; }; }; + secure = true; }; mors = { cores = 2; @@ -307,7 +308,7 @@ let }; uriel = { pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; - mail = "uriel@mors.retiolum"; + mail = "lass@uriel.retiolum"; }; }; }; diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix index 39d9fec54..531e6c87b 100644 --- a/krebs/3modules/urlwatch.nix +++ b/krebs/3modules/urlwatch.nix @@ -78,7 +78,7 @@ let HOME = cfg.dataDir; LC_ALL = "en_US.UTF-8"; LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; - SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + SSL_CERT_FILE = "${pkgs.cacert}/etc/ca-bundle.crt"; }; serviceConfig = { User = user.name; @@ -100,7 +100,6 @@ let ExecStart = pkgs.writeScript "urlwatch" '' #! /bin/sh set -euf - from=${escapeShellArg cfg.from} mailto=${escapeShellArg cfg.mailto} urlsFile=${escapeShellArg urlsFile} |