diff options
| author | tv <tv@shackspace.de> | 2015-07-19 23:23:57 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-07-19 23:23:57 +0200 |
| commit | da797530dea52ee9b77c5a4225c10d940fb276e4 (patch) | |
| tree | a33ee09ad67df0db3481a132203218d8a4205bff | |
| parent | 037847a71f726a2ad0d6faec58fba699f55d0832 (diff) | |
1 tv cd: enable 2 tv charybdis
| -rw-r--r-- | 1systems/tv/cd.nix | 7 | ||||
| -rw-r--r-- | 2configs/tv/git-public.nix | 2 | ||||
| -rw-r--r-- | 3modules/tv/identity.nix | 2 | ||||
| -rw-r--r-- | Zcerts/charybdis_cd.crt.pem | 24 |
4 files changed, 33 insertions, 2 deletions
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index 0e45068a6..42e4ecf1a 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -15,6 +15,13 @@ in ../../2configs/tv/exim-smarthost.nix ../../2configs/tv/git-public.nix { + imports = [ ../../2configs/tv/charybdis.nix ]; + tv.charybdis = { + enable = true; + sslCert = ../../Zcerts/charybdis_cd.crt.pem; + }; + } + { imports = [ ../../3modules/tv/ejabberd.nix ]; tv.ejabberd = { enable = true; diff --git a/2configs/tv/git-public.nix b/2configs/tv/git-public.nix index 6ea547c86..aef83667f 100644 --- a/2configs/tv/git-public.nix +++ b/2configs/tv/git-public.nix @@ -55,7 +55,7 @@ let post-receive = git.irc-announce { nick = config.networking.hostName; # TODO make this the default channel = "#retiolum"; - server = "ire.retiolum"; + server = "cd.retiolum"; }; }; public = true; diff --git a/3modules/tv/identity.nix b/3modules/tv/identity.nix index ed7eb5703..d3ac91393 100644 --- a/3modules/tv/identity.nix +++ b/3modules/tv/identity.nix @@ -26,7 +26,7 @@ let "cgit" ]; addr = "10.243.113.222"; - #addr6 = "42:4522:25f8:36bb:8ccb:0150:231a:2af3"; + addr6 = "42:4522:25f8:36bb:8ccb:0150:231a:2af3"; #internet-addr = "162.219.5.183"; cores = 2; }; diff --git a/Zcerts/charybdis_cd.crt.pem b/Zcerts/charybdis_cd.crt.pem new file mode 100644 index 000000000..c613ff380 --- /dev/null +++ b/Zcerts/charybdis_cd.crt.pem @@ -0,0 +1,24 @@ +-----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----- |