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

cd: drop stuff now done by ni #2

Browse Source
This commit is contained in:
tv 2016-11-11 08:47:46 +01:00
parent ae73660522
commit b837dec290
14 changed files with 13 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lass/2configs/buildbot-standalone.nix
View File

@ -212,7 +212,7 @@ in {
irc = { irc = {
enable = true; enable = true;
nick = "buildbot-lass"; nick = "buildbot-lass";
server = "cd.retiolum"; server = "ni.r";
channels = [ "retiolum" ]; channels = [ "retiolum" ];
allowForce = true; allowForce = true;
}; };

2
lass/2configs/git.nix
View File

@ -54,7 +54,7 @@ let
# TODO make nick = config.krebs.build.host.name the default # TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name; nick = config.krebs.build.host.name;
channel = "#retiolum"; channel = "#retiolum";
server = "cd.retiolum"; server = "ni.r";
verbose = config.krebs.build.host.name == "prism"; verbose = config.krebs.build.host.name == "prism";
branches = [ "master" ]; branches = [ "master" ];
}; };

4
lass/2configs/repo-sync.nix
View File

@ -15,7 +15,7 @@ let
nick = config.networking.hostName; nick = config.networking.hostName;
verbose = false; verbose = false;
channel = "#retiolum"; channel = "#retiolum";
server = "cd.retiolum"; server = "ni.r";
branches = [ "newest" ]; branches = [ "newest" ];
}; };
}); });
@ -41,7 +41,7 @@ let
mirror.url = "${mirror}${name}"; mirror.url = "${mirror}${name}";
}; };
tv = { tv = {
origin.url = "http://cgit.cd/${name}"; origin.url = "http://cgit.ni.r/${name}";
mirror.url = "${mirror}${name}"; mirror.url = "${mirror}${name}";
}; };
lassulus = { lassulus = {

2
makefu/1systems/gum.nix
View File

@ -40,7 +40,7 @@ in {
''; '';
connectTo = [ connectTo = [
"muhbaasu" "tahoe" "flap" "wry" "muhbaasu" "tahoe" "flap" "wry"
"cd" "ni"
"fastpoke" "prism" "dishfire" "echelon" "cloudkrebs" "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs"
]; ];
}; };

2
makefu/1systems/pnp.nix
View File

@ -36,7 +36,7 @@
enable = true; enable = true;
debug = true; debug = true;
extraEnviron = { extraEnviron = {
REAKTOR_HOST = "cd.retiolum"; REAKTOR_HOST = "ni.r";
}; };
plugins = with pkgs.ReaktorPlugins; [ stockholm-issue nixos-version sed-plugin ]; plugins = with pkgs.ReaktorPlugins; [ stockholm-issue nixos-version sed-plugin ];
channels = [ "#retiolum" ]; channels = [ "#retiolum" ];

2
makefu/2configs/git/brain-retiolum.nix
View File

@ -29,7 +29,7 @@ let
nick = config.networking.hostName; nick = config.networking.hostName;
channel = "#retiolum"; channel = "#retiolum";
# TODO remove the hardcoded hostname # TODO remove the hardcoded hostname
server = "cd.retiolum"; server = "ni.r";
}; };
}; };
}; };

2
makefu/2configs/git/cgit-retiolum.nix
View File

@ -52,7 +52,7 @@ let
verbose = config.krebs.build.host.name == "gum"; verbose = config.krebs.build.host.name == "gum";
channel = "#retiolum"; channel = "#retiolum";
# TODO remove the hardcoded hostname # TODO remove the hardcoded hostname
server = "cd.retiolum"; server = "ni.r";
}; };
}; };
}; };

2
shared/2configs/cgit-mirror.nix
View File

@ -17,7 +17,7 @@ let
nick = config.networking.hostName; nick = config.networking.hostName;
verbose = false; verbose = false;
channel = "#retiolum"; channel = "#retiolum";
server = "cd.retiolum"; server = "ni.r";
}; };
}; };
}; };

2
shared/2configs/repo-sync.nix
View File

@ -13,7 +13,7 @@ with lib;
mirror.url = mirror; mirror.url = mirror;
}; };
tv = { tv = {
origin.url = http://cgit.cd/stockholm ; origin.url = http://cgit.ni.r/stockholm;
mirror.url = mirror; mirror.url = mirror;
}; };
lassulus = { lassulus = {

2
shared/2configs/shared-buildbot.nix
View File

@ -159,7 +159,7 @@
irc = { irc = {
enable = true; enable = true;
nick = "wolfbot"; nick = "wolfbot";
server = "cd.retiolum"; server = "ni.r";
channels = [ "retiolum" ]; channels = [ "retiolum" ];
allowForce = true; allowForce = true;
}; };

20
tv/1systems/cd.nix
View File

@ -11,26 +11,6 @@ with import <stockholm/lib>;
../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/exim-smarthost.nix ../2configs/exim-smarthost.nix
../2configs/retiolum.nix ../2configs/retiolum.nix
{
tv.charybdis = {
enable = true;
ssl_cert = ../Zcerts/charybdis_cd.crt.pem;
};
tv.iptables.input-retiolum-accept-tcp = [
config.tv.charybdis.port
config.tv.charybdis.sslport
];
}
{
tv.ejabberd = {
enable = true;
hosts = [ "jabber.viljetic.de" ];
};
tv.iptables.input-internet-accept-tcp = [
"xmpp-client"
"xmpp-server"
];
}
]; ];
networking = { networking = {

2
tv/2configs/git.nix
View File

@ -89,7 +89,7 @@ let
# TODO make nick = config.krebs.build.host.name the default # TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name; nick = config.krebs.build.host.name;
channel = "#retiolum"; channel = "#retiolum";
server = "cd.retiolum"; server = "ni.r";
verbose = true; verbose = true;
}; };
}; };

2
tv/5pkgs/netcup/default.nix
View File

@ -16,7 +16,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "netcup-1.0.0"; name = "netcup-1.0.0";
src = fetchgit { src = fetchgit {
url = "http://cgit.cd.krebsco.de/netcup"; url = "http://cgit.ni.krebsco.de/netcup";
rev = "tags/v1.0.0"; rev = "tags/v1.0.0";
sha256 = "0m6mk16pblvnapxykxdccvphslbv1gjfziyr86bnqin1xb1g99bq"; sha256 = "0m6mk16pblvnapxykxdccvphslbv1gjfziyr86bnqin1xb1g99bq";
}; };

24
tv/Zcerts/charybdis_cd.crt.pem
View File

@ -1,24 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIEGzCCAwOgAwIBAgIJAJJiphQRTzFPMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
VQQGEwJhcTEYMBYGA1UECAwPTWFyaWUgQnlyZCBMYW5kMSIwIAYDVQQHDBlCZW50
bGV5IFN1YmdsYWNpYWwgVHJlbmNoMQ4wDAYDVQQKDAVrcmViczERMA8GA1UECwwI
cmV0aW9sdW0xFDASBgNVBAMMC2NkLnJldGlvbHVtMR0wGwYJKoZIhvcNAQkBFg50
dkB3dS5yZXRpb2x1bTAeFw0xNTA3MTkxODQ2MjhaFw0xNjA3MDkxODQ2MjhaMIGj
MQswCQYDVQQGEwJhcTEYMBYGA1UECAwPTWFyaWUgQnlyZCBMYW5kMSIwIAYDVQQH
DBlCZW50bGV5IFN1YmdsYWNpYWwgVHJlbmNoMQ4wDAYDVQQKDAVrcmViczERMA8G
A1UECwwIcmV0aW9sdW0xFDASBgNVBAMMC2NkLnJldGlvbHVtMR0wGwYJKoZIhvcN
AQkBFg50dkB3dS5yZXRpb2x1bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBAMyPb37kchbjZi6WsvpQeGOVEBTU8B4E24GkfetbfYtsFqW6pIKN7DlTFKzJ
3WKSLIf/cZuBQJucKuc8QXc5ZEXQ66QyCiX6al0j4C0AnHN17OhgH3yvmioWI4kI
ycD4N5TnaD2V0OK/HlhKCrIEly6+Nczeo+k5vrcgkkSYJivFpgK1r5+taBYiU4cc
Pgke2p3mRpZFfK61Ft6DlAg2rL2NVt7Qk0pp6BgCrtVIl968SmVKAEQBHnSYd9z2
bNE2PH3qI+FLIfioOfXazmogxoQWR9LbKPUQ5nFRDXEJZg1hKDzseUkwV/oU8W3K
a37lOovqy+qwjYELrWP346/OF5UCAwEAAaNQME4wHQYDVR0OBBYEFI7WWP+tabb5
CH5aY5mJcMdKGeaXMB8GA1UdIwQYMBaAFI7WWP+tabb5CH5aY5mJcMdKGeaXMAwG
A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKAF8hSu7Cgp2jei3GPVOE+R
TtZUePjFJw7iUSYaG1loGfY23IgEzS/jPd/m4jueRTDbtDl7cFTUmKKsF1WWH84l
s49J2HktiHTiHyZphgWFfbjUZO4nbH11Pac64WPfoeTzm9LnM0xXNd/7VCDXRess
a6pXtAQXAZri9HOsAeNO0WFivu4oug2pyUoLE64o3UemSwBi0JW2W1KvuYGnQXEa
HqrFGLBSEQuD4wTePdK0USjhNC8ceMx04b1hUQzuMf8pcXdpkLN6bIOaA/FRxmX9
3L+6CZPVfQvvw10eLjWv3UYgIjOQFCUR4LsvkVxTaEav0KwmyCC4GUr9Vd+n3eQ=
-----END CERTIFICATE-----