From 0f383cfb2c36c1e2470802e2eef4780bdd847800 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 1 Jul 2021 16:10:06 +0200 Subject: [PATCH] move miniflux to rx300, change domain to rss.franzi.business --- .../powerdns/files/bind-zones/franzi.business | 2 + data/ssl/_.franzi.business.crt.pem | 27 ++++++++ .../_.franzi.business.crt_intermediate.pem | 63 +++++++++++++++++++ data/ssl/_.franzi.business.key.pem.vault | 1 + nodes/htz/ex42-1048908.py | 2 +- nodes/rx300.py | 13 +++- 6 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 data/ssl/_.franzi.business.crt.pem create mode 100644 data/ssl/_.franzi.business.crt_intermediate.pem create mode 100644 data/ssl/_.franzi.business.key.pem.vault diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business index 9408074..cf1e73e 100644 --- a/data/powerdns/files/bind-zones/franzi.business +++ b/data/powerdns/files/bind-zones/franzi.business @@ -23,6 +23,8 @@ sewfile IN A 116.203.205.248 IN AAAA 2a01:4f8:c0c:c71b::1 IN TXT "v=spf1 a mx ~all" +rss IN CNAME rx300.kunbox.net. + status IN A 51.195.44.8 status IN AAAA 2001:41d0:701:1100::2618 diff --git a/data/ssl/_.franzi.business.crt.pem b/data/ssl/_.franzi.business.crt.pem new file mode 100644 index 0000000..05c1ae3 --- /dev/null +++ b/data/ssl/_.franzi.business.crt.pem @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEiDCCA3CgAwIBAgISAwyLo6zJleTDSeOY/DBn9B2CMA0GCSqGSIb3DQEBCwUA +MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD +EwJSMzAeFw0yMTA3MDExMjUyMDRaFw0yMTA5MjkxMjUyMDNaMBoxGDAWBgNVBAMT +D2ZyYW56aS5idXNpbmVzczB2MBAGByqGSM49AgEGBSuBBAAiA2IABKj8L/vAhGHW +x0/ohIqTbOaEx7xEE2G375T4A8qISJEe8ONZ6HRksZyEZVbSyO4VCButT+frQez+ +sPC/T/cXr56d65xHwXDDbZxo97QnOVityzoXu1625xT5M/WHbaeSCaOCAlwwggJY +MA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw +DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUnIi+ktiUJ0r0uEsAKYJOsAF/d8gwHwYD +VR0jBBgwFoAUFC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEG +CCsGAQUFBzABhhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0 +dHA6Ly9yMy5pLmxlbmNyLm9yZy8wLQYDVR0RBCYwJIIRKi5mcmFuemkuYnVzaW5l +c3OCD2ZyYW56aS5idXNpbmVzczBMBgNVHSAERTBDMAgGBmeBDAECATA3BgsrBgEE +AYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9y +ZzCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AJQgvB6O1Y1siHMfgosiLA3R2k1e +bE+UPWHbTi9YTaLCAAABemJXRYsAAAQDAEcwRQIhALYyxXMjKj3pE5SUtQT1iGHL +Ptfc0ich+pfxyH7xWahkAiAKRU0sbfWo+O3Xf3nj25re7YWl94/RAxPwmaOD+GQf +IQB1AH0+8viP/4hVaCTCwMqeUol5K8UOeAl/LmqXaJl+IvDXAAABemJXRgoAAAQD +AEYwRAIgKwisr1dvveizOUyXWscs1X1bLBN4dKXCk2UXH+6h4QwCIHbxJFpmG8H5 +eSfL7hiCkPV0YUjeYi0pGTpcZ20+8XVjMA0GCSqGSIb3DQEBCwUAA4IBAQAejGaG +75QWWjrbWOwB3MxQH1EatIcrLAGlC2vviJ4Nj83VSY3GUDBmDQ9yRDVHBuyzu4H6 +xbv5NkwUW1aOYLk6d3e0ckInXeMBu99ga/gQbrMsNvJ/xX2usg/L1utWIYkFeNxt +1WsIsCtqbboJoL1f/TM5CS+81wvje3ZiS5V3fCX7pcrbbHy1WazcRG8zCOt70R+t +YcXVeH1HQpZ47B9UHKOVYChk/LTD9RBjmohVJs2Hb3+j8bIQC8EcS+KRqyqB4E8R +BAMvPeb2KNIm5LlY5OXe+CvtmBslUDk0EYwO3+NM7xZsY5AEyBaAME1aU4bBW4fd +UWRxfSxwp/jC0mbK +-----END CERTIFICATE----- diff --git a/data/ssl/_.franzi.business.crt_intermediate.pem b/data/ssl/_.franzi.business.crt_intermediate.pem new file mode 100644 index 0000000..efd07a1 --- /dev/null +++ b/data/ssl/_.franzi.business.crt_intermediate.pem @@ -0,0 +1,63 @@ + +-----BEGIN CERTIFICATE----- +MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw +WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg +RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP +R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx +sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm +NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg +Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG +/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB +Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA +FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw +AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw +Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB +gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W +PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl +ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz +CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm +lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4 +avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2 +yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O +yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids +hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+ +HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv +MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX +nLRbwHOoq7hHwg== +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/ +MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT +DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC +ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL +wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D +LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK +4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5 +bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y +sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ +Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4 +FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc +SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql +PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND +TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw +SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1 +c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx ++tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB +ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu +b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E +U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu +MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC +5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW +9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG +WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O +he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC +Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5 +-----END CERTIFICATE----- diff --git a/data/ssl/_.franzi.business.key.pem.vault b/data/ssl/_.franzi.business.key.pem.vault new file mode 100644 index 0000000..9d9dff0 --- /dev/null +++ b/data/ssl/_.franzi.business.key.pem.vault @@ -0,0 +1 @@ +encrypt$gAAAAABg3ciHUwVWmvIs1wb9WloyB_MbTtl6CKN624_2ydKkqR3-St4xBJRHQm2c5E-Glrj5W47qo9774Q3WfTf5GSdH_TUPQhDjkW2oA-MkjC0pmA2pnvc27GLxeEHULIz3Z7vhltzwmK_cDZ-id1M3vzBBjUF3YBbMLz15cp4O7D4WNU0nxSMdVn8C1yj9ynt_QSq150V6QlsxKqT4Mw9ilSweykDmuoM1WpprxLeGKm9EDxLJDjLwialyzYlc1sDSCu8wxEmtrqyskgEDz0CnyP1D27tPNbT9y0wl1c8WVVXEoSwU01XT6n8mU-WWNtcXp6R0QwChgerg2tDmO_Qvk2JaVbYW483u9c8SlGxmN65gKpgj-3GewLOREYEFXypbVIGJjajbOosaMT-x2GTdI3w9xTb8UhRLrchSIG-zjfR2KJSP0njIjX-KykpK1ovDYqCQ7VMEC_m4bj4UTZXq1yriMbdpFzLjT_cBQ2oRJAb_ekFLCpkeQl4PnqKDKJLEVE2ncZLWM2ZwWS9WLR8iloJYgNM2yvrtfSCikJWXpSGPtXgrIWE= \ No newline at end of file diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 893a4f1..44969de 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -9,7 +9,7 @@ nodes['htz.ex42-1048908'] = { 'matrix-synapse', 'mautrix-telegram', 'mautrix-whatsapp', - 'miniflux', + #'miniflux', 'mx-puppet-discord', 'nodejs', 'oidentd', diff --git a/nodes/rx300.py b/nodes/rx300.py index 50933e5..34d397d 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -1,5 +1,3 @@ -# To be put into Colocation. - # To use the serial console in iRMC, set up grub as follows: # GRUB_TIMEOUT=30 # GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0,115200 console=tty0" @@ -10,6 +8,7 @@ nodes['rx300'] = { 'hostname': '31.47.232.106', 'bundles': { 'lm-sensors', + 'miniflux', 'postgresql', 'smartd', 'vmhost', @@ -35,6 +34,16 @@ nodes['rx300'] = { 'ipmitool': {}, }, }, + 'miniflux': { + 'domain': 'rss.franzi.business', + }, + 'nginx': { + 'vhosts': { + 'miniflux': { + 'ssl': '_.franzi.business', + }, + }, + }, 'postgresql': { 'version': '13', },