From eabe9ae4ecebf8013f7901dd1e05f3857ebfb17c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 24 Oct 2016 14:38:54 +0200 Subject: tv: DRY up ca-bundle defs --- tv/2configs/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 39d0c4f..0854e53 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -112,13 +112,14 @@ with import ; }; } - (let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in { - environment.variables = { - CURL_CA_BUNDLE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - }; - }) + { + environment.variables = + flip genAttrs (_: "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt") [ + "CURL_CA_BUNDLE" + "GIT_SSL_CAINFO" + "SSL_CERT_FILE" + ]; + } { services.cron.enable = false; -- cgit v1.3.1 From 7b9a0b028859d248cd5d48ea916988e5825a61f5 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 27 Oct 2016 19:44:53 +0200 Subject: tv nixpkgs: e4fb65a -> 0195ab8 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 0854e53..1114ac1 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9"; + ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; -- cgit v1.3.1 From 42bbcc3431d754664a0d5ab0e290974361321318 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 3 Nov 2016 15:25:56 +0100 Subject: tv nixpkgs: 0195ab8 -> 238c7e0 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 1114ac1..514d313 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731"; + ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; -- cgit v1.3.1 From a6a6427340dee681c6da5a683886c9a4032154ad Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 4 Nov 2016 23:40:43 +0100 Subject: tv git: add loldns --- tv/2configs/git.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tv/2configs') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index d937be2..eb13e42 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -32,6 +32,9 @@ let get = {}; hack = {}; load-env = {}; + loldns = { + cgit.desc = "toy DNS server"; + }; make-snapshot = {}; much = {}; netcup = { -- cgit v1.3.1 From 2047f66bf86ba5c5c630ea41d3e21ade06f64c8a Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 20:50:59 +0100 Subject: tv nixpkgs: 238c7e0 -> 1e1112e --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 514d313..dbf3114 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e"; + ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; -- cgit v1.3.1 From b9c2293068af6c07782d0d862012c952ae532203 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 23:15:33 +0100 Subject: pkgs.*.src.url: s/cd/ni/g --- tv/2configs/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index eb13e42..b38ef00 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -84,7 +84,7 @@ let make-public-repo = name: { cgit ? {}, ... }: { inherit cgit name; public = true; - hooks = optionalAttrs (config.krebs.build.host.name == "cd") { + hooks = optionalAttrs (config.krebs.build.host.name == "ni") { post-receive = pkgs.git-hooks.irc-announce { # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; -- cgit v1.3.1 From 7e30c7d075666dca4d3865e2bcb3b6a7d9364cfe Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 23:54:09 +0100 Subject: tv retiolum: s/cd|echelon/ni/ --- tv/2configs/retiolum.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix index ad1116d..a914dad 100644 --- a/tv/2configs/retiolum.nix +++ b/tv/2configs/retiolum.nix @@ -7,9 +7,8 @@ with import ; enable = true; connectTo = filter (ne config.krebs.build.host.name) [ "gum" + "ni" "prism" - "echelon" - "cd" ]; tincPackage = pkgs.tinc_pre; }; -- cgit v1.3.1 From d61262d0e757b94e8b1d2ccca04c6e08be74a00e 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 --- 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 ------------------------ 7 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 tv/Zcerts/charybdis_cd.crt.pem (limited to 'tv/2configs') diff --git a/shared/2configs/cgit-mirror.nix b/shared/2configs/cgit-mirror.nix index a3860a0..c2326a5 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 753b0f4..4219e5d 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 22144e9..7aed627 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 03a5e58..dd8e2cc 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 b38ef00..b6724f4 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 2443e9e..6d2ec68 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 c613ff3..0000000 --- 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.3.1 [cgit] Unable to lock slot /tmp/cgit/17300000.lock: No such file or directory (2)