m 1 wry: krebs.nginx -> services.nginx

This commit is contained in:
makefu 2016-12-24 23:41:33 +01:00
parent c427ea4f03
commit 56e756fc5a

View file

@ -13,7 +13,7 @@ in {
../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/save-diskspace.nix ../2configs/save-diskspace.nix
../2configs/bepasty-dual.nix # ../2configs/bepasty-dual.nix
../2configs/iodined.nix ../2configs/iodined.nix
../2configs/backup.nix ../2configs/backup.nix
@ -21,9 +21,7 @@ in {
# other nginx # other nginx
../2configs/nginx/euer.wiki.nix ../2configs/nginx/euer.wiki.nix
../2configs/nginx/euer.blog.nix ../2configs/nginx/euer.blog.nix
../2configs/nginx/euer.test.nix # ../2configs/nginx/euer.test.nix
#../2configs/elchos/stats.nix
# collectd # collectd
# ../2configs/collectd/collectd-base.nix # ../2configs/collectd/collectd-base.nix
@ -52,7 +50,7 @@ in {
krebs.bepasty.servers.external.nginx.listen = [ "${external-ip}:80" "${external-ip}:443 ssl" ]; krebs.bepasty.servers.external.nginx.listen = [ "${external-ip}:80" "${external-ip}:443 ssl" ];
# prepare graphs # prepare graphs
krebs.nginx.enable = true; services.nginx.enable = true;
krebs.retiolum-bootstrap.enable = true; krebs.retiolum-bootstrap.enable = true;
krebs.tinc_graphs = { krebs.tinc_graphs = {
@ -61,12 +59,17 @@ in {
enable = true; enable = true;
# TODO: remove hard-coded hostname # TODO: remove hard-coded hostname
complete = { complete = {
listen = [ "${internal-ip}:80" ]; extraConfig = ''
server-names = [ "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ]; if ( $server_addr = "${external-ip}" ) {
return 403;
}
'';
serverAliases = [ "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
}; };
anonymous = { anonymous = {
listen = [ "${external-ip}:80" ] ; enableSSL = true;
server-names = [ "graphs.krebsco.de" ]; forceSSL = true;
enableACME = true;
}; };
}; };
}; };