From 831c0eafd3843c14f8fa4ba3a26f4836630bca1c Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Tue, 16 Aug 2022 15:05:07 +0100 Subject: [PATCH] Renamed sample-rc.d -> rc.d. Update netdata cert/key. Add msmtp cert/key. --- base-files/certificates/_Netdata_.crt | 14 ++++++++++++++ base-files/certificates/_Netdata_.pem.gpg | Bin 0 -> 278 bytes base-files/certificates/_msmtp_.crt | 14 ++++++++++++++ base-files/certificates/_msmtp_.pem.gpg | 1 + .../_netdata_.opensourcerers.net-cert.pem | 18 ------------------ .../_netdata_.opensourcerers.net-key.pem.gpg | Bin 1407 -> 0 bytes {sample-rc.d => rc.d}/rc.firewall-float | 0 {sample-rc.d => rc.d}/rc.firewall-guests | 0 {sample-rc.d => rc.d}/rc.firewall-hosts | 0 .../rc.firewall-hypervisor-fry | 0 {sample-rc.d => rc.d}/rc.firewall-hypervisors | 0 {sample-rc.d => rc.d}/rc.local | 0 {sample-rc.d => rc.d}/rc.local_shutdown | 0 {sample-rc.d => rc.d}/rc.modules.local | 0 {sample-rc.d => rc.d}/rc.proftpd | 0 {sample-rc.d => rc.d}/rc.rsyncd | 0 {sample-rc.d => rc.d}/rc.tftpd | 0 17 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 base-files/certificates/_Netdata_.crt create mode 100644 base-files/certificates/_Netdata_.pem.gpg create mode 100644 base-files/certificates/_msmtp_.crt create mode 100644 base-files/certificates/_msmtp_.pem.gpg delete mode 100644 base-files/certificates/_netdata_.opensourcerers.net-cert.pem delete mode 100644 base-files/certificates/_netdata_.opensourcerers.net-key.pem.gpg rename {sample-rc.d => rc.d}/rc.firewall-float (100%) rename {sample-rc.d => rc.d}/rc.firewall-guests (100%) rename {sample-rc.d => rc.d}/rc.firewall-hosts (100%) rename {sample-rc.d => rc.d}/rc.firewall-hypervisor-fry (100%) rename {sample-rc.d => rc.d}/rc.firewall-hypervisors (100%) rename {sample-rc.d => rc.d}/rc.local (100%) rename {sample-rc.d => rc.d}/rc.local_shutdown (100%) rename {sample-rc.d => rc.d}/rc.modules.local (100%) rename {sample-rc.d => rc.d}/rc.proftpd (100%) rename {sample-rc.d => rc.d}/rc.rsyncd (100%) rename {sample-rc.d => rc.d}/rc.tftpd (100%) diff --git a/base-files/certificates/_Netdata_.crt b/base-files/certificates/_Netdata_.crt new file mode 100644 index 0000000..5001561 --- /dev/null +++ b/base-files/certificates/_Netdata_.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICOjCCAeCgAwIBAgIIYHtpShnmuGwwCgYIKoZIzj0EAwQwcDEeMBwGA1UEChMV +VGhlIFNsYWNrd2FyZSBOZXR3b3JrMSMwIQYDVQQDExpUaGUgU2xhY2t3YXJlIE5l +dHdvcmsgUm9vdDEpMCcGCSqGSIb3DQEJARYac3lzYWRtaW5Ac2xhY2t3YXJlLm5l +dHdvcmswHhcNMjAwMTAxMDAwMDAwWhcNMzkxMjMxMjM1OTU5WjBvMR4wHAYDVQQK +ExVUaGUgU2xhY2t3YXJlIE5ldHdvcmsxIjAgBgNVBAMMGSouaG9zdHMuc2xhY2t3 +YXJlLm5ldHdvcmsxKTAnBgkqhkiG9w0BCQEWGnN5c2FkbWluQHNsYWNrd2FyZS5u +ZXR3b3JrMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZvQT6MNZChFRfi+8VmNr +b9WzAlNxF8l7TniFEOP+e9XRNf+I+hKDoFkrlSeheBfV6bo3IyFEgSVYZ5TOEFKi +d6NlMGMwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3bwcn2DYPxnmIU5rQrk6ZIQc +80gwDgYDVR0PAQH/BAQDAgWgMCQGA1UdEQQdMBuCGSouaG9zdHMuc2xhY2t3YXJl +Lm5ldHdvcmswCgYIKoZIzj0EAwQDSAAwRQIgberTBp2+5qHqP9xaGiu/iHxYHJ9P +sclVpIrImZW/1P8CIQCqlr7uveCvsryzMCFwZ8HxtrC02YcO2fM2+4eOVYThEA== +-----END CERTIFICATE----- diff --git a/base-files/certificates/_Netdata_.pem.gpg b/base-files/certificates/_Netdata_.pem.gpg new file mode 100644 index 0000000000000000000000000000000000000000..ae1f67b52cbae5e76ceb66587494d03311c6732f GIT binary patch literal 278 zcmV+x0qOpX4Fm}T0=hv6;e;z#BHz-$L;)~iO5c{rRmw)sn6sliktP?D*i^_7v~4>B z5|Rr^G7eN{0K*#tcuO}W!`sP9l^v?Aw6v;d_+q5jG^pReTfruX8wXpH%RPFeS^gVQ z-i<(WNk^!{jHqcgp$^JmK~c!I!eL20%nsD_?30x`NnYXIwy6qZLe-ITtJxY1gT0ky zLQA|URGr_di8j~*P320a2|WMR@Jva9Sf>B!{u2nc7bc!|-6WI8G9U<_34MnRtp;&0 zA#{tG2)f!3+JThlG>1luy7dKkEcZo-ks2I~S$)sCDHT81;)uvP!5W>Sw#8JXXbV(| cdkSsf&8VA?vYbE*+ifXf1>QBFn`9gJM6)J=F8}}l literal 0 HcmV?d00001 diff --git a/base-files/certificates/_msmtp_.crt b/base-files/certificates/_msmtp_.crt new file mode 100644 index 0000000..b7b57bb --- /dev/null +++ b/base-files/certificates/_msmtp_.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICOjCCAeCgAwIBAgIIRS92cVC+C54wCgYIKoZIzj0EAwQwcDEeMBwGA1UEChMV +VGhlIFNsYWNrd2FyZSBOZXR3b3JrMSMwIQYDVQQDExpUaGUgU2xhY2t3YXJlIE5l +dHdvcmsgUm9vdDEpMCcGCSqGSIb3DQEJARYac3lzYWRtaW5Ac2xhY2t3YXJlLm5l +dHdvcmswHhcNMjAwMTAxMDAwMDAwWhcNMzkxMjMxMjM1OTU5WjBvMR4wHAYDVQQK +ExVUaGUgU2xhY2t3YXJlIE5ldHdvcmsxIjAgBgNVBAMMGSouaG9zdHMuc2xhY2t3 +YXJlLm5ldHdvcmsxKTAnBgkqhkiG9w0BCQEWGnN5c2FkbWluQHNsYWNrd2FyZS5u +ZXR3b3JrMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEiUGZwDQf81e2vOoeFi3O +HnWLUPIYr4BnUSALuMsgPXiaZS+cRynamaTOJwYIS+7UWoPpurmJCnjlEUrLlEGk +ZaNlMGMwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUbIWKNzYYpXPBWxtqALOrnO/C +juUwDgYDVR0PAQH/BAQDAgWgMCQGA1UdEQQdMBuCGSouaG9zdHMuc2xhY2t3YXJl +Lm5ldHdvcmswCgYIKoZIzj0EAwQDSAAwRQIhALC/5TMUjmQ2XTRGYEMO/hcX04w3 +EHsM2hJB/wJJE14XAiB4MFB/DUBZjIj4XR3XI6Pe819l/v0EZNmsw5nJ3b6Z7g== +-----END CERTIFICATE----- diff --git a/base-files/certificates/_msmtp_.pem.gpg b/base-files/certificates/_msmtp_.pem.gpg new file mode 100644 index 0000000..f67bf01 --- /dev/null +++ b/base-files/certificates/_msmtp_.pem.gpg @@ -0,0 +1 @@ +  \ݷCq|S!wayƇHO!"ҹLu lʭ{Y͕Gqz(pKARԀsP{R>F?[C)0U@Z*?Zb2a, 2aZq0k7{NH:IAڸp;8sQTj]}T#t Q@"Jq,}DP) :~obtf+'6B] \ No newline at end of file diff --git a/base-files/certificates/_netdata_.opensourcerers.net-cert.pem b/base-files/certificates/_netdata_.opensourcerers.net-cert.pem deleted file mode 100644 index c8aa480..0000000 --- a/base-files/certificates/_netdata_.opensourcerers.net-cert.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC5TCCAoygAwIBAgIIaHEGFd0wSYgwCgYIKoZIzj0EAwIwZDEYMBYGA1UEChMP -T3BlbiBTb3VyY2VyZXJzMR0wGwYDVQQDExRPcGVuIFNvdXJjZXJlcnMgUm9vdDEp -MCcGCSqGSIb3DQEJARYac3lzYWRtaW5Ab3BlbnNvdXJjZXJlcnMudWswHhcNMjAw -MTAxMDAwMDAwWhcNMzkxMjMxMjM1OTU5WjBkMRgwFgYDVQQKEw9PcGVuIFNvdXJj -ZXJlcnMxHTAbBgNVBAMMFCoub3BlbnNvdXJjZXJlcnMubmV0MSkwJwYJKoZIhvcN -AQkBFhpzeXNhZG1pbkBvcGVuc291cmNlcmVycy51azCCASIwDQYJKoZIhvcNAQEB -BQADggEPADCCAQoCggEBALir2QAhAZbRiw2Cjwz0J/8d7hTOChLbNTl89SberOs7 -ov3fJ9ULPb4MFKzWGWBidXkNKGZRk46GtGKOCPd7CY5znQOnvfsJbMfnhZYITN+t -Y035l8aZbr1sbPE+WD4p8jhAasUv0oM7mKjRrfc1pzPf1h6VFaxHaFYidcZm/LUP -N9YSSVajMApSaU4IfnQvVsF7muviK6BMAMtlw0DqQGbjyfSD+nAh8BXbEy+p4IyB -CVavf0KP+gnmOYDtUvVRdNzWpM/7plqVk66zMEGRVaasLjDvdrE/Yk79kYNyKa67 -TubRDur31DOfm0HKdwdIEny8G49Wk7cNmoYVt9nFre0CAwEAAaNdMFswDAYDVR0T -AQH/BAIwADAdBgNVHQ4EFgQUuuRI1xj/fdc5ozU2SqSbfh/fqHIwCwYDVR0PBAQD -AgQwMB8GA1UdEQQYMBaCFCoub3BlbnNvdXJjZXJlcnMubmV0MAoGCCqGSM49BAMC -A0cAMEQCIG28MaJR0I2U5tZsNyIWkqgS78s+lScbdL9OS2l10M9CAiAtiJohUst3 -Mo25sds8QgrmcRmeF+0xCxDrYZcvQfBY5g== ------END CERTIFICATE----- diff --git a/base-files/certificates/_netdata_.opensourcerers.net-key.pem.gpg b/base-files/certificates/_netdata_.opensourcerers.net-key.pem.gpg deleted file mode 100644 index a7e6816f7f917150acf3fe4f847c859843751dcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1407 zcmV-_1%UdD4Fm@R0wt{z_jEy-^I+2I0i;S+Iw*Oc82~lYwxk4vf*fhJ4JR^IO#0Ei z=zPCmVzxLtnH({MI!%(xz`qyHw<{MQl1)l-SUHkC(Q^4DcOFJ`&TGg1rLl3a!K!U; zE=V=rq%-?aX$-%(=iRY#DDhTkfr($tT2ttZ|ABkjgCiX$q4-5s2a)TA!xE2%Ow^+g z>Q9;D>a7(&{P%t0#;|B&03b0OnuIBrriNb!n0M4* zzH1!G6CV`kRcpzl9N{sE1UDW1lxD_+L~(`;9p@xl-odtFlTSm%(+v*J!w74J113j{ z+aM{I(Bn0(*lc2VrayJc;H5kP*tu4m$HLtAEn%G$^^U&pa}}@(&oh{~yBU?$^6_pt z7m*1ezH$E9;mU(L)uK_5AJptU{y&_4OG^4ng}QhTqyrS)L1p{;ey$+zCp- zSPqO?JI&4EBUca9e*Ba8-lIpZuFU*|WTDh~s{z;dpZo&OGu;lky3Mme4EGZ+rBHm? z(I8e((!RSk6@ZgjLjtcr1Ne@Ir333Xp;lvk{ ziqdJInj!rxz^t4rAq&Wcfd7_~yHfs&RgYPcYPo5FmGryv{XX;00Y*l$Vk-qVa$DWA zRPwMpN_H1KU7EXp)N41|EK#! zq4q5MgS)sPEb6g1BSKPC5J8Gh>0wiv*-&9CaKVp2(IV2n-Mn0**0P_OIVxGm^yjs0s0?r_nCEO@C|AAhggo>O>rbiPj+6%h zZX}qs(Q~h)3va8k${Y!9)gX#7DF}%|{?vS_LfQtweM_#5?iSMt36HEBNN~kknImQc zH|K!m+J^K8_s=xR;LWA-DXf=bWt< ND)mlx^-73}LFwv{wjTfh diff --git a/sample-rc.d/rc.firewall-float b/rc.d/rc.firewall-float similarity index 100% rename from sample-rc.d/rc.firewall-float rename to rc.d/rc.firewall-float diff --git a/sample-rc.d/rc.firewall-guests b/rc.d/rc.firewall-guests similarity index 100% rename from sample-rc.d/rc.firewall-guests rename to rc.d/rc.firewall-guests diff --git a/sample-rc.d/rc.firewall-hosts b/rc.d/rc.firewall-hosts similarity index 100% rename from sample-rc.d/rc.firewall-hosts rename to rc.d/rc.firewall-hosts diff --git a/sample-rc.d/rc.firewall-hypervisor-fry b/rc.d/rc.firewall-hypervisor-fry similarity index 100% rename from sample-rc.d/rc.firewall-hypervisor-fry rename to rc.d/rc.firewall-hypervisor-fry diff --git a/sample-rc.d/rc.firewall-hypervisors b/rc.d/rc.firewall-hypervisors similarity index 100% rename from sample-rc.d/rc.firewall-hypervisors rename to rc.d/rc.firewall-hypervisors diff --git a/sample-rc.d/rc.local b/rc.d/rc.local similarity index 100% rename from sample-rc.d/rc.local rename to rc.d/rc.local diff --git a/sample-rc.d/rc.local_shutdown b/rc.d/rc.local_shutdown similarity index 100% rename from sample-rc.d/rc.local_shutdown rename to rc.d/rc.local_shutdown diff --git a/sample-rc.d/rc.modules.local b/rc.d/rc.modules.local similarity index 100% rename from sample-rc.d/rc.modules.local rename to rc.d/rc.modules.local diff --git a/sample-rc.d/rc.proftpd b/rc.d/rc.proftpd similarity index 100% rename from sample-rc.d/rc.proftpd rename to rc.d/rc.proftpd diff --git a/sample-rc.d/rc.rsyncd b/rc.d/rc.rsyncd similarity index 100% rename from sample-rc.d/rc.rsyncd rename to rc.d/rc.rsyncd diff --git a/sample-rc.d/rc.tftpd b/rc.d/rc.tftpd similarity index 100% rename from sample-rc.d/rc.tftpd rename to rc.d/rc.tftpd