Merge branch 'master' of http://cgit.ni/stockholm

This commit is contained in:
makefu 2018-01-09 23:59:54 +01:00
commit 4131fc8aca
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
8 changed files with 17 additions and 14 deletions

View File

@ -12,10 +12,10 @@
''; '';
config = '' config = ''
serverinfo { serverinfo {
name = "${config.krebs.build.host.name}.irc.retiolum"; name = "${config.krebs.build.host.name}.irc.r";
sid = "1as"; sid = "1as";
description = "miep!"; description = "miep!";
network_name = "irc.retiolum"; network_name = "irc.r";
hub = yes; hub = yes;
vhost = "0.0.0.0"; vhost = "0.0.0.0";

View File

@ -14,7 +14,6 @@ with import <stockholm/lib>;
ip4.addr = "10.243.132.96"; ip4.addr = "10.243.132.96";
ip6.addr = "42:0000:0000:0000:0000:0000:0000:2342"; ip6.addr = "42:0000:0000:0000:0000:0000:0000:2342";
aliases = [ aliases = [
"hiawatha.retiolum"
"hiawatha.r" "hiawatha.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
@ -39,7 +38,6 @@ with import <stockholm/lib>;
ip4.addr = "10.243.134.66"; ip4.addr = "10.243.134.66";
ip6.addr = "42:0000:0000:0000:0000:0000:0000:1379"; ip6.addr = "42:0000:0000:0000:0000:0000:0000:1379";
aliases = [ aliases = [
"axon.retiolum"
"axon.r" "axon.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
@ -80,10 +78,8 @@ with import <stockholm/lib>;
ip4.addr = "10.243.132.55"; ip4.addr = "10.243.132.55";
ip6.addr = "42:0000:0000:0000:0000:0000:0000:1357"; ip6.addr = "42:0000:0000:0000:0000:0000:0000:1357";
aliases = [ aliases = [
"onondaga.retiolum"
"onondaga.r" "onondaga.r"
"cgit.onondaga.r" "cgit.onondaga.r"
"cgit.onondaga.retiolum"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -104,11 +100,11 @@ with import <stockholm/lib>;
}; };
users = { users = {
nin = { nin = {
mail = "nin@axon.retiolum"; mail = "nin@axon.r";
pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl4jHl2dya9Tecot7AcHuk57FiPN0lo8eDa03WmTOCCU7gEJLgpi/zwLxY/K4eXsDgOt8LJwddicgruX2WgIYD3LnwtuN40/U9QqqdBIv/5sYZTcShAK2jyPj0vQJlVUpL7DLxxRH+t4lWeRw/1qaAAVt9jEVbzT5RH233E6+SbXxfnQDhDwOXwD1qfM10BOGh63iYz8/loXG1meb+pkv3HTf5/D7x+/y1XvWRPKuJ2Ml33p2pE3cTd+Tie1O8CREr45I9JOIOKUDQk1klFL5NNXnaQ9h1FRCsnQuoGztoBq8ed6XXL/b8mQ0lqJMxHIoCuDN/HBZYJ0z+1nh8X6XH nin@axon"; pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl4jHl2dya9Tecot7AcHuk57FiPN0lo8eDa03WmTOCCU7gEJLgpi/zwLxY/K4eXsDgOt8LJwddicgruX2WgIYD3LnwtuN40/U9QqqdBIv/5sYZTcShAK2jyPj0vQJlVUpL7DLxxRH+t4lWeRw/1qaAAVt9jEVbzT5RH233E6+SbXxfnQDhDwOXwD1qfM10BOGh63iYz8/loXG1meb+pkv3HTf5/D7x+/y1XvWRPKuJ2Ml33p2pE3cTd+Tie1O8CREr45I9JOIOKUDQk1klFL5NNXnaQ9h1FRCsnQuoGztoBq8ed6XXL/b8mQ0lqJMxHIoCuDN/HBZYJ0z+1nh8X6XH nin@axon";
}; };
nin_h = { nin_h = {
mail = "nin@hiawatha.retiolum"; mail = "nin@hiawatha.r";
pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDicZLUPEVNX7SgqYWcjPo0UESRizEfIvVVbiwa1aApA8x25u/5R3sevcgbIpLHYKDMl5tebny9inr6G2zqB6oq/pocQjHxrPnuLzqjvqeSpbjQjlNWJ9GaHT5koTXZHdkEXGL0vfv1SRDNWUiK0rNymr3GXab4DyrnRnuNl/G1UtLf4Zka94YUD0SSPdS9y6knnRrUWKjGMFBZEbNSgHqMGATPQP9VDwKHIO2OWGfiBAJ4nj/MWj+BxHDleCMY9zbym8yY7p/0PLaUe9eIyLC8MftJ5suuMmASlj+UGWgnqUxWxsMHax9y7CTAc23r1NNCXN5LC6/facGt0rEQrdrTizBgOA1FSHAPCl5f0DBEgWBrRuygEcAueuGWvI8/uvtvQQZLhosDbXEfs/3vm2xoYBe7wH4NZHm+d2LqgIcPXehH9hVQsl6pczngTCJt0Q/6tIMffjhDHeYf6xbe/n3AqFT0PylUSvOw/H5iHws3R6rxtgnOio7yTJ4sq0NMzXCtBY6LYPGnkwf0oKsgB8KavZVnxzF8B1TD4nNi0a7ma7bd1LMzI/oGE6i8kDMROgisIECOcoe8YYJZXIne/wimhhRKZAsd+VrKUo4SzNIavCruCodGAVh2vfrqRJD+HD/aWH7Vr1fCEexquaxeKpRtKGIPW9LRCcEsTilqpZdAiw== nin@hiawatha"; pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDicZLUPEVNX7SgqYWcjPo0UESRizEfIvVVbiwa1aApA8x25u/5R3sevcgbIpLHYKDMl5tebny9inr6G2zqB6oq/pocQjHxrPnuLzqjvqeSpbjQjlNWJ9GaHT5koTXZHdkEXGL0vfv1SRDNWUiK0rNymr3GXab4DyrnRnuNl/G1UtLf4Zka94YUD0SSPdS9y6knnRrUWKjGMFBZEbNSgHqMGATPQP9VDwKHIO2OWGfiBAJ4nj/MWj+BxHDleCMY9zbym8yY7p/0PLaUe9eIyLC8MftJ5suuMmASlj+UGWgnqUxWxsMHax9y7CTAc23r1NNCXN5LC6/facGt0rEQrdrTizBgOA1FSHAPCl5f0DBEgWBrRuygEcAueuGWvI8/uvtvQQZLhosDbXEfs/3vm2xoYBe7wH4NZHm+d2LqgIcPXehH9hVQsl6pczngTCJt0Q/6tIMffjhDHeYf6xbe/n3AqFT0PylUSvOw/H5iHws3R6rxtgnOio7yTJ4sq0NMzXCtBY6LYPGnkwf0oKsgB8KavZVnxzF8B1TD4nNi0a7ma7bd1LMzI/oGE6i8kDMROgisIECOcoe8YYJZXIne/wimhhRKZAsd+VrKUo4SzNIavCruCodGAVh2vfrqRJD+HD/aWH7Vr1fCEexquaxeKpRtKGIPW9LRCcEsTilqpZdAiw== nin@hiawatha";
}; };
}; };

View File

@ -122,6 +122,7 @@ with import <stockholm/lib>;
cgit 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} cgit 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
krebsco.de. 60 IN MX 5 ni krebsco.de. 60 IN MX 5 ni
krebsco.de. 60 IN TXT v=spf1 mx -all
''; '';
}; };
nets = { nets = {

View File

@ -23,7 +23,10 @@ in {
servers = { servers = {
"paste.r" = { "paste.r" = {
nginx = { nginx = {
serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ]; serverAliases = [
"paste.${config.krebs.build.host.name}"
"paste.r"
];
}; };
defaultPermissions = "admin,list,create,read,delete"; defaultPermissions = "admin,list,create,read,delete";
secretKey = secKey; secretKey = secKey;

View File

@ -28,7 +28,10 @@ in {
servers = { servers = {
"paste.r" = { "paste.r" = {
nginx = { nginx = {
serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ]; serverAliases = [
"paste.${config.krebs.build.host.name}"
"paste.r"
];
}; };
defaultPermissions = "admin,list,create,read,delete"; defaultPermissions = "admin,list,create,read,delete";
secretKeyFile = secKey; secretKeyFile = secKey;

View File

@ -10,7 +10,7 @@ let
ModulePath "${collectd-connect-time}/lib/${python.libPrefix}/site-packages/" ModulePath "${collectd-connect-time}/lib/${python.libPrefix}/site-packages/"
Import "collectd_connect_time" Import "collectd_connect_time"
<Module collectd_connect_time> <Module collectd_connect_time>
target "wry.retiolum" "localhost" "google.com" target "wry.r" "localhost" "google.com"
interval 30 interval 30
</Module> </Module>
</Plugin> </Plugin>
@ -19,7 +19,7 @@ let
LoadPlugin write_graphite LoadPlugin write_graphite
<Plugin "write_graphite"> <Plugin "write_graphite">
<Carbon> <Carbon>
Host "heidi.retiolum" Host "heidi.r"
Port "2003" Port "2003"
Prefix "retiolum." Prefix "retiolum."
EscapeCharacter "_" EscapeCharacter "_"

View File

@ -76,7 +76,7 @@ in {
virtualHosts = { virtualHosts = {
"${ext-dom}" = { "${ext-dom}" = {
#serverAliases = [ #serverAliases = [
# "wiki.makefu.retiolum" # "wiki.makefu.r"
# "wiki.makefu" # "wiki.makefu"
#]; #];
forceSSL = true; forceSSL = true;

View File

@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix"; nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
nixpkgs.git = { nixpkgs.git = {
# nixos-17.09 # nixos-17.09
ref = mkDefault "d0f0657ca06cc8cb239cb94f430b53bcdf755887"; ref = mkDefault "0653b73bf61f3a23d28c38ab7e9c69a318d433de";
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
}; };
secrets.file = getAttr builder { secrets.file = getAttr builder {