From b837dec290e54f532cd5539c93a663ba11f68c54 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 11 Nov 2016 08:47:46 +0100 Subject: cd: drop stuff now done by ni #2 --- lass/2configs/buildbot-standalone.nix | 2 +- lass/2configs/git.nix | 2 +- lass/2configs/repo-sync.nix | 4 ++-- makefu/1systems/gum.nix | 2 +- makefu/1systems/pnp.nix | 2 +- makefu/2configs/git/brain-retiolum.nix | 2 +- makefu/2configs/git/cgit-retiolum.nix | 2 +- shared/2configs/cgit-mirror.nix | 2 +- shared/2configs/repo-sync.nix | 2 +- shared/2configs/shared-buildbot.nix | 2 +- tv/1systems/cd.nix | 20 -------------------- tv/2configs/git.nix | 2 +- tv/5pkgs/netcup/default.nix | 2 +- tv/Zcerts/charybdis_cd.crt.pem | 24 ------------------------ 14 files changed, 13 insertions(+), 57 deletions(-) delete mode 100644 tv/Zcerts/charybdis_cd.crt.pem diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index df01a84c..d6dc1b22 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -212,7 +212,7 @@ in { irc = { enable = true; nick = "buildbot-lass"; - server = "cd.retiolum"; + server = "ni.r"; channels = [ "retiolum" ]; allowForce = true; }; diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 06cae734..57950e1b 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -54,7 +54,7 @@ let # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; channel = "#retiolum"; - server = "cd.retiolum"; + server = "ni.r"; verbose = config.krebs.build.host.name == "prism"; branches = [ "master" ]; }; diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix index f8814973..fe782c4c 100644 --- a/lass/2configs/repo-sync.nix +++ b/lass/2configs/repo-sync.nix @@ -15,7 +15,7 @@ let nick = config.networking.hostName; verbose = false; channel = "#retiolum"; - server = "cd.retiolum"; + server = "ni.r"; branches = [ "newest" ]; }; }); @@ -41,7 +41,7 @@ let mirror.url = "${mirror}${name}"; }; tv = { - origin.url = "http://cgit.cd/${name}"; + origin.url = "http://cgit.ni.r/${name}"; mirror.url = "${mirror}${name}"; }; lassulus = { diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index bfd880b8..86882554 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -40,7 +40,7 @@ in { ''; connectTo = [ "muhbaasu" "tahoe" "flap" "wry" - "cd" + "ni" "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs" ]; }; diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index a460a87e..0c3676c8 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -36,7 +36,7 @@ enable = true; debug = true; extraEnviron = { - REAKTOR_HOST = "cd.retiolum"; + REAKTOR_HOST = "ni.r"; }; plugins = with pkgs.ReaktorPlugins; [ stockholm-issue nixos-version sed-plugin ]; channels = [ "#retiolum" ]; diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix index 81305272..b637ca03 100644 --- a/makefu/2configs/git/brain-retiolum.nix +++ b/makefu/2configs/git/brain-retiolum.nix @@ -29,7 +29,7 @@ let nick = config.networking.hostName; channel = "#retiolum"; # TODO remove the hardcoded hostname - server = "cd.retiolum"; + server = "ni.r"; }; }; }; diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix index 5c2a0fbd..553a2397 100644 --- a/makefu/2configs/git/cgit-retiolum.nix +++ b/makefu/2configs/git/cgit-retiolum.nix @@ -52,7 +52,7 @@ let verbose = config.krebs.build.host.name == "gum"; channel = "#retiolum"; # TODO remove the hardcoded hostname - server = "cd.retiolum"; + server = "ni.r"; }; }; }; diff --git a/shared/2configs/cgit-mirror.nix b/shared/2configs/cgit-mirror.nix index a3860a0e..c2326a5c 100644 --- a/shared/2configs/cgit-mirror.nix +++ b/shared/2configs/cgit-mirror.nix @@ -17,7 +17,7 @@ let nick = config.networking.hostName; verbose = false; channel = "#retiolum"; - server = "cd.retiolum"; + server = "ni.r"; }; }; }; diff --git a/shared/2configs/repo-sync.nix b/shared/2configs/repo-sync.nix index 753b0f47..4219e5d0 100644 --- a/shared/2configs/repo-sync.nix +++ b/shared/2configs/repo-sync.nix @@ -13,7 +13,7 @@ with lib; mirror.url = mirror; }; tv = { - origin.url = http://cgit.cd/stockholm ; + origin.url = http://cgit.ni.r/stockholm; mirror.url = mirror; }; lassulus = { diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 22144e9e..7aed6272 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -159,7 +159,7 @@ irc = { enable = true; nick = "wolfbot"; - server = "cd.retiolum"; + server = "ni.r"; channels = [ "retiolum" ]; allowForce = true; }; diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 03a5e58d..dd8e2cc6 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -11,26 +11,6 @@ with import ; ../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/exim-smarthost.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 = { diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index b38ef00f..b6724f40 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -89,7 +89,7 @@ let # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; channel = "#retiolum"; - server = "cd.retiolum"; + server = "ni.r"; verbose = true; }; }; diff --git a/tv/5pkgs/netcup/default.nix b/tv/5pkgs/netcup/default.nix index 2443e9e7..6d2ec689 100644 --- a/tv/5pkgs/netcup/default.nix +++ b/tv/5pkgs/netcup/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { name = "netcup-1.0.0"; src = fetchgit { - url = "http://cgit.cd.krebsco.de/netcup"; + url = "http://cgit.ni.krebsco.de/netcup"; rev = "tags/v1.0.0"; sha256 = "0m6mk16pblvnapxykxdccvphslbv1gjfziyr86bnqin1xb1g99bq"; }; diff --git a/tv/Zcerts/charybdis_cd.crt.pem b/tv/Zcerts/charybdis_cd.crt.pem deleted file mode 100644 index c613ff38..00000000 --- a/tv/Zcerts/charybdis_cd.crt.pem +++ /dev/null @@ -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----- -- cgit v1.2.3