m: gum takes over euer,wiki,graphs from wry
This commit is contained in:
parent
8a40e9346e
commit
9224e9c4c8
@ -285,11 +285,8 @@ with import <stockholm/lib>;
|
|||||||
cores = 1;
|
cores = 1;
|
||||||
extraZones = {
|
extraZones = {
|
||||||
"krebsco.de" = ''
|
"krebsco.de" = ''
|
||||||
euer IN A ${nets.internet.ip4.addr}
|
|
||||||
wiki.euer IN A ${nets.internet.ip4.addr}
|
|
||||||
wry IN A ${nets.internet.ip4.addr}
|
wry IN A ${nets.internet.ip4.addr}
|
||||||
io IN NS wry.krebsco.de.
|
io IN NS wry.krebsco.de.
|
||||||
graphs IN A ${nets.internet.ip4.addr}
|
|
||||||
tinc IN A ${nets.internet.ip4.addr}
|
tinc IN A ${nets.internet.ip4.addr}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@ -307,13 +304,8 @@ with import <stockholm/lib>;
|
|||||||
ip6.addr = "42:6e1e:cc8a:7cef:827:f938:8c64:baad";
|
ip6.addr = "42:6e1e:cc8a:7cef:827:f938:8c64:baad";
|
||||||
aliases = [
|
aliases = [
|
||||||
"graphs.wry.retiolum"
|
"graphs.wry.retiolum"
|
||||||
"graphs.r" "graphs.retiolum"
|
|
||||||
"paste.wry.retiolum"
|
"paste.wry.retiolum"
|
||||||
"wry.r" "wry.retiolum"
|
"wry.r" "wry.retiolum"
|
||||||
"wiki.makefu.retiolum"
|
|
||||||
"wiki.wry.retiolum"
|
|
||||||
"blog.makefu.retiolum"
|
|
||||||
"blog.wry.retiolum"
|
|
||||||
];
|
];
|
||||||
tinc.pubkey = ''
|
tinc.pubkey = ''
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
@ -452,6 +444,9 @@ with import <stockholm/lib>;
|
|||||||
cgit.euer IN A ${nets.internet.ip4.addr}
|
cgit.euer IN A ${nets.internet.ip4.addr}
|
||||||
o.euer IN A ${nets.internet.ip4.addr}
|
o.euer IN A ${nets.internet.ip4.addr}
|
||||||
dl.euer IN A ${nets.internet.ip4.addr}
|
dl.euer IN A ${nets.internet.ip4.addr}
|
||||||
|
euer IN A ${nets.internet.ip4.addr}
|
||||||
|
wiki.euer IN A ${nets.internet.ip4.addr}
|
||||||
|
graphs IN A ${nets.internet.ip4.addr}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
nets = rec {
|
nets = rec {
|
||||||
@ -473,6 +468,12 @@ with import <stockholm/lib>;
|
|||||||
"o.gum.retiolum"
|
"o.gum.retiolum"
|
||||||
"tracker.makefu.r"
|
"tracker.makefu.r"
|
||||||
"tracker.makefu.retiolum"
|
"tracker.makefu.retiolum"
|
||||||
|
|
||||||
|
"graphs.r" "graphs.retiolum"
|
||||||
|
"wiki.makefu.retiolum"
|
||||||
|
"wiki.wry.retiolum"
|
||||||
|
"blog.makefu.retiolum"
|
||||||
|
"blog.wry.retiolum"
|
||||||
];
|
];
|
||||||
tinc.pubkey = ''
|
tinc.pubkey = ''
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
|
@ -29,9 +29,12 @@ in {
|
|||||||
../2configs/deployment/owncloud.nix
|
../2configs/deployment/owncloud.nix
|
||||||
../2configs/nginx/share-download.nix
|
../2configs/nginx/share-download.nix
|
||||||
../2configs/nginx/euer.test.nix
|
../2configs/nginx/euer.test.nix
|
||||||
|
../2configs/nginx/euer.wiki.nix
|
||||||
|
../2configs/nginx/euer.blog.nix
|
||||||
../2configs/nginx/public_html.nix
|
../2configs/nginx/public_html.nix
|
||||||
../2configs/nginx/update.connector.one.nix
|
../2configs/nginx/update.connector.one.nix
|
||||||
../2configs/deployment/mycube.connector.one.nix
|
../2configs/deployment/mycube.connector.one.nix
|
||||||
|
../2configs/deployment/graphs.nix
|
||||||
|
|
||||||
# ../2configs/opentracker.nix
|
# ../2configs/opentracker.nix
|
||||||
../2configs/logging/central-stats-client.nix
|
../2configs/logging/central-stats-client.nix
|
||||||
|
@ -19,8 +19,6 @@ in {
|
|||||||
../2configs/backup.nix
|
../2configs/backup.nix
|
||||||
|
|
||||||
# other nginx
|
# other nginx
|
||||||
../2configs/nginx/euer.wiki.nix
|
|
||||||
../2configs/nginx/euer.blog.nix
|
|
||||||
# ../2configs/nginx/euer.test.nix
|
# ../2configs/nginx/euer.test.nix
|
||||||
|
|
||||||
# collectd
|
# collectd
|
||||||
@ -36,31 +34,6 @@ in {
|
|||||||
# prepare graphs
|
# prepare graphs
|
||||||
services.nginx.enable = true;
|
services.nginx.enable = true;
|
||||||
krebs.retiolum-bootstrap.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 = {
|
networking = {
|
||||||
firewall = {
|
firewall = {
|
||||||
|
Loading…
Reference in New Issue
Block a user