Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m: graphs -> graph

Browse Source
This commit is contained in:
makefu 2017-04-15 17:58:20 +02:00
parent 549c89dd99
commit c45cd788d2
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
krebs/3modules/makefu/default.nix
View File

@ -33,7 +33,7 @@ with import <stockholm/lib>;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.113.98"; ip4.addr = "10.243.113.98";
ip6.addr = "42:5cf1:e7f2:3fd:cd4c:a1ee:ec71:7096"; # ip6.addr = "42:5cf1:e7f2:3fd:cd4c:a1ee:ec71:7096";
aliases = [ aliases = [
"fileleech.r" "fileleech.r"
]; ];
@ -247,7 +247,6 @@ with import <stockholm/lib>;
"krebsco.de" = '' "krebsco.de" = ''
euer IN MX 1 aspmx.l.google.com. euer IN MX 1 aspmx.l.google.com.
nixos.unstable IN CNAME krebscode.github.io. nixos.unstable IN CNAME krebscode.github.io.
pigstarter IN A ${nets.internet.ip4.addr}
gold IN A ${nets.internet.ip4.addr} gold IN A ${nets.internet.ip4.addr}
boot IN A ${nets.internet.ip4.addr} boot IN A ${nets.internet.ip4.addr}
''; '';
@ -301,7 +300,7 @@ 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 = [
"wry.r" "wry.r"
"graphs.wry.r" "graph.wry.r"
"paste.wry.r" "paste.wry.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
@ -436,12 +435,13 @@ with import <stockholm/lib>;
mattermost.euer IN A ${nets.internet.ip4.addr} mattermost.euer IN A ${nets.internet.ip4.addr}
git.euer IN A ${nets.internet.ip4.addr} git.euer IN A ${nets.internet.ip4.addr}
gum IN A ${nets.internet.ip4.addr} gum IN A ${nets.internet.ip4.addr}
pigstarter IN A ${nets.internet.ip4.addr}
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} euer IN A ${nets.internet.ip4.addr}
wiki.euer IN A ${nets.internet.ip4.addr} wiki.euer IN A ${nets.internet.ip4.addr}
graphs IN A ${nets.internet.ip4.addr} graph IN A ${nets.internet.ip4.addr}
''; '';
}; };
nets = rec { nets = rec {
@ -461,7 +461,7 @@ with import <stockholm/lib>;
"o.gum.r" "o.gum.r"
"tracker.makefu.r" "tracker.makefu.r"
"graphs.r" "graph.r"
"wiki.makefu.r" "wiki.makefu.r"
"wiki.gum.r" "wiki.gum.r"
"blog.makefu.r" "blog.makefu.r"
@ -491,7 +491,7 @@ with import <stockholm/lib>;
ip4.prefix = "10.8.10.0/24"; ip4.prefix = "10.8.10.0/24";
aliases = [ aliases = [
"shoney.siem" "shoney.siem"
"graphs.siem" "graph.siem"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

4
makefu/2configs/deployment/graphs.nix
View File

@ -23,8 +23,8 @@ in {
} }
''; '';
serverAliases = [ serverAliases = [
"graphs.r" "graphs.retiolum" "graph.r"
"graphs.${hn}" "graphs.${hn}.retiolum" "graph.${hn}" "graph.${hn}.r"
]; ];
}; };
anonymous = { anonymous = {