summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-04-11 21:50:29 +0200
committerlassulus <lass@lassul.us>2017-04-11 21:50:29 +0200
commit1f317b8a1a38e41cb721835ed46b2db1a5318f23 (patch)
tree5f4a6a791c4278a0709362d82ded9b7235d28112 /makefu/1systems
parent575a37f00e0ee6866c72a99327921068222fc1b0 (diff)
parent9224e9c4c8432ce8d7788592b9d25cfc29440ee6 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/gum.nix3
-rw-r--r--makefu/1systems/wry.nix27
2 files changed, 3 insertions, 27 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 910493026..c39997ebf 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -29,9 +29,12 @@ in {
../2configs/deployment/owncloud.nix
../2configs/nginx/share-download.nix
../2configs/nginx/euer.test.nix
+ ../2configs/nginx/euer.wiki.nix
+ ../2configs/nginx/euer.blog.nix
../2configs/nginx/public_html.nix
../2configs/nginx/update.connector.one.nix
../2configs/deployment/mycube.connector.one.nix
+ ../2configs/deployment/graphs.nix
# ../2configs/opentracker.nix
../2configs/logging/central-stats-client.nix
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index c403d2352..a5c4d3cca 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -19,8 +19,6 @@ in {
../2configs/backup.nix
# other nginx
- ../2configs/nginx/euer.wiki.nix
- ../2configs/nginx/euer.blog.nix
# ../2configs/nginx/euer.test.nix
# collectd
@@ -36,31 +34,6 @@ in {
# prepare graphs
services.nginx.enable = true;
krebs.retiolum-bootstrap.enable = true;
- krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
- if ( $server_addr = "${external-ip}" ) {
- return 403;
- }
- '';
- krebs.tinc_graphs = {
- enable = true;
- nginx = {
- enable = true;
- # TODO: remove hard-coded hostname
- complete = {
- extraConfig = ''
- if ( $server_addr = "${external-ip}" ) {
- return 403;
- }
- '';
- serverAliases = [ "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
- };
- anonymous = {
- enableSSL = true;
- forceSSL = true;
- enableACME = true;
- };
- };
- };
networking = {
firewall = {