diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-29 10:55:54 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-29 10:55:54 +0100 |
| commit | 6410fd0f8557658fa5e180844def32f8bda7313d (patch) | |
| tree | 8266ef1e81f57ee4565987dd1c285cd9b8510342 /makefu/2configs/nginx | |
| parent | 8bc538b9e7bdf6fa9d93d1662ee1b889e0a5d458 (diff) | |
m 2 *: s,/root/secrets,<secrets>,
Diffstat (limited to 'makefu/2configs/nginx')
| -rw-r--r-- | makefu/2configs/nginx/euer.blog.nix | 5 | ||||
| -rw-r--r-- | makefu/2configs/nginx/euer.wiki.nix | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/makefu/2configs/nginx/euer.blog.nix b/makefu/2configs/nginx/euer.blog.nix index a8be1993b..e97050ec4 100644 --- a/makefu/2configs/nginx/euer.blog.nix +++ b/makefu/2configs/nginx/euer.blog.nix @@ -2,8 +2,9 @@ with lib; let - ssl_cert = "/root/secrets/wildcard.krebsco.de.crt"; - ssl_key = "/root/secrets/wildcard.krebsco.de.key"; + sec = toString <secrets>; + ssl_cert = "${sec}/wildcard.krebsco.de.crt"; + ssl_key = "${sec}/wildcard.krebsco.de.key"; hostname = krebs.build.host.name; in { krebs.nginx = { diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix index 1e1834b1b..fbcfe2047 100644 --- a/makefu/2configs/nginx/euer.wiki.nix +++ b/makefu/2configs/nginx/euer.wiki.nix @@ -2,8 +2,9 @@ with lib; let - ssl_cert = "/root/secrets/wildcard.krebsco.de.crt"; - ssl_key = "/root/secrets/wildcard.krebsco.de.key"; + sec = toString <secrets>; + ssl_cert = "${sec}/wildcard.krebsco.de.crt"; + ssl_key = "${sec}/wildcard.krebsco.de.key"; user = config.services.nginx.user; group = config.services.nginx.group; fpm-socket = "/var/run/php5-fpm.sock"; @@ -16,7 +17,7 @@ let # contains: # user1 = pass1 # userN = passN - tw-pass-file = "/root/secrets/tw-pass.ini"; + tw-pass-file = "${sec}/tw-pass.ini"; external-ip = head config.krebs.build.host.nets.internet.addrs4; internal-ip = head config.krebs.build.host.nets.retiolum.addrs4; in { |