diff options
| author | makefu <github@syntax-fehler.de> | 2017-04-11 21:38:27 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-04-11 21:38:27 +0200 |
| commit | 9224e9c4c8432ce8d7788592b9d25cfc29440ee6 (patch) | |
| tree | bca7d8282e19a2783203cdea34f72a42c2139ad8 /makefu/1systems | |
| parent | 8a40e9346e9fbfd20cf53d733f0c2790b1a7f7b1 (diff) | |
m: gum takes over euer,wiki,graphs from wry
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/gum.nix | 3 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 27 |
2 files changed, 3 insertions, 27 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 91049302..c39997eb 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 c403d235..a5c4d3cc 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 = { |