From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 128E9138334 for ; Tue, 11 Dec 2018 16:42:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10B82E0BC3; Tue, 11 Dec 2018 16:42:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C23F5E0B11 for ; Tue, 11 Dec 2018 16:42:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A3C4335CD5 for ; Tue, 11 Dec 2018 16:42:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 104E74E5 for ; Tue, 11 Dec 2018 16:42:23 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1544545940.599c2cadead2280e522fa8dace3f7446f364e0bc.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/, app-admin/rsyslog/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/rsyslog/Manifest app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild X-VCS-Directories: app-admin/rsyslog/files/ app-admin/rsyslog/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 599c2cadead2280e522fa8dace3f7446f364e0bc X-VCS-Branch: master Date: Tue, 11 Dec 2018 16:42:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: caa9b1c8-5447-4026-a0b9-cce4e0a6bc8f X-Archives-Hash: 4f79b166edf97632524d18984067c159 commit: 599c2cadead2280e522fa8dace3f7446f364e0bc Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Dec 11 16:20:58 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Dec 11 16:32:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599c2cad app-admin/rsyslog: drop old Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> app-admin/rsyslog/Manifest | 2 - .../files/rsyslog-8.35.0-fix-issue2719.patch | 241 ----------- .../files/rsyslog-8.35.0-fix-issue2726.patch | 41 -- app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild | 440 --------------------- 4 files changed, 724 deletions(-) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index e61c657990d..ee6db5b2743 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,8 +1,6 @@ -DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479 DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd -DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f diff --git a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch deleted file mode 100644 index 8996acd27e8..00000000000 --- a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch +++ /dev/null @@ -1,241 +0,0 @@ -Add missing files for mmkubernetes tests - -Upstream bug: https://github.com/rsyslog/rsyslog/pull/2719 - ---- /dev/null -+++ b/tests/mmkubernetes-basic.out.json -@@ -0,0 +1,110 @@ -+[{ -+ "kubernetes": { -+ "namespace_id": "namespace-name2-id", -+ "namespace_labels": { -+ "label_1_key": "label 1 value", -+ "label_with_empty_value": "", -+ "label_2_key": "label 2 value" -+ }, -+ "creation_timestamp": "2018-04-09T21:56:39Z", -+ "pod_id": "pod-name2-id", -+ "labels": { -+ "custom_label": "pod-name2-label-value", -+ "deploymentconfig": "pod-name2-dc", -+ "component": "pod-name2-component", -+ "label_with_empty_value": "", -+ "deployment": "pod-name2-deployment" -+ }, -+ "pod_name": "pod-name2", -+ "namespace_name": "namespace-name2", -+ "container_name": "container-name2", -+ "master_url": "http://localhost:18443" -+ }, -+ "docker": { -+ "container_id": "id2" -+ } -+}, -+{ -+ "message": "a message from container 4", -+ "CONTAINER_NAME": "some-prefix_container-name4_pod-name4_namespace-name4_unused4_unused44", -+ "CONTAINER_ID_FULL": "id4", -+ "kubernetes": { -+ "namespace_id": "namespace-name4-id", -+ "namespace_labels": { -+ "label_1_key": "label 1 value", -+ "label_with_empty_value": "", -+ "label_2_key": "label 2 value" -+ }, -+ "creation_timestamp": "2018-04-09T21:56:39Z", -+ "pod_id": "pod-name4-id", -+ "labels": { -+ "custom_label": "pod-name4-label-value", -+ "deploymentconfig": "pod-name4-dc", -+ "component": "pod-name4-component", -+ "label_with_empty_value": "", -+ "deployment": "pod-name4-deployment" -+ }, -+ "pod_name": "pod-name4", -+ "namespace_name": "namespace-name4", -+ "container_name": "container-name4", -+ "master_url": "http://localhost:18443" -+ }, -+ "docker": { -+ "container_id": "id4" -+ } -+}, -+{ -+ "kubernetes": { -+ "namespace_id": "namespace-name1-id", -+ "namespace_labels": { -+ "label_1_key": "label 1 value", -+ "label_with_empty_value": "", -+ "label_2_key": "label 2 value" -+ }, -+ "creation_timestamp": "2018-04-09T21:56:39Z", -+ "pod_id": "pod-name1-id", -+ "labels": { -+ "custom_label": "pod-name1-label-value", -+ "deploymentconfig": "pod-name1-dc", -+ "component": "pod-name1-component", -+ "label_with_empty_value": "", -+ "deployment": "pod-name1-deployment" -+ }, -+ "pod_name": "pod-name1", -+ "namespace_name": "namespace-name1", -+ "container_name": "container-name1", -+ "master_url": "http://localhost:18443" -+ }, -+ "docker": { -+ "container_id": "id1" -+ } -+}, -+{ -+ "message": "a message from container 3", -+ "CONTAINER_NAME": "some-prefix_container-name3.container-hash3_pod-name3_namespace-name3_unused3_unused33", -+ "CONTAINER_ID_FULL": "id3", -+ "kubernetes": { -+ "namespace_id": "namespace-name3-id", -+ "namespace_labels": { -+ "label_1_key": "label 1 value", -+ "label_with_empty_value": "", -+ "label_2_key": "label 2 value" -+ }, -+ "creation_timestamp": "2018-04-09T21:56:39Z", -+ "pod_id": "pod-name3-id", -+ "labels": { -+ "custom_label": "pod-name3-label-value", -+ "deploymentconfig": "pod-name3-dc", -+ "component": "pod-name3-component", -+ "label_with_empty_value": "", -+ "deployment": "pod-name3-deployment" -+ }, -+ "pod_name": "pod-name3", -+ "namespace_name": "namespace-name3", -+ "container_name": "container-name3", -+ "master_url": "http://localhost:18443" -+ }, -+ "docker": { -+ "container_id": "id3" -+ } -+}] ---- /dev/null -+++ b/tests/mmkubernetes_test_server.py -@@ -0,0 +1,121 @@ -+# Used by the mmkubernetes tests -+# This is a simple http server which responds to kubernetes api requests -+# and responds with kubernetes api server responses -+# added 2018-04-06 by richm, released under ASL 2.0 -+import os -+import json -+import sys -+ -+try: -+ from http.server import HTTPServer, BaseHTTPRequestHandler -+except ImportError: -+ from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler -+ -+ns_template = '''{{ -+ "kind": "Namespace", -+ "apiVersion": "v1", -+ "metadata": {{ -+ "name": "{namespace_name}", -+ "selfLink": "/api/v1/namespaces/{namespace_name}", -+ "uid": "{namespace_name}-id", -+ "resourceVersion": "2988", -+ "creationTimestamp": "2018-04-09T21:56:39Z", -+ "labels": {{ -+ "label.1.key":"label 1 value", -+ "label.2.key":"label 2 value", -+ "label.with.empty.value":"" -+ }}, -+ "annotations": {{ -+ "k8s.io/description": "", -+ "k8s.io/display-name": "", -+ "k8s.io/node-selector": "", -+ "k8s.io/sa.scc.mcs": "s0:c9,c4", -+ "k8s.io/sa.scc.supplemental-groups": "1000080000/10000", -+ "k8s.io/sa.scc.uid-range": "1000080000/10000", -+ "quota.k8s.io/cluster-resource-override-enabled": "false" -+ }} -+ }}, -+ "spec": {{ -+ "finalizers": [ -+ "openshift.io/origin", -+ "kubernetes" -+ ] -+ }}, -+ "status": {{ -+ "phase": "Active" -+ }} -+}}''' -+ -+pod_template = '''{{ -+ "kind": "Pod", -+ "apiVersion": "v1", -+ "metadata": {{ -+ "name": "{pod_name}", -+ "generateName": "{pod_name}-prefix", -+ "namespace": "{namespace_name}", -+ "selfLink": "/api/v1/namespaces/{namespace_name}/pods/{pod_name}", -+ "uid": "{pod_name}-id", -+ "resourceVersion": "3486", -+ "creationTimestamp": "2018-04-09T21:56:39Z", -+ "labels": {{ -+ "component": "{pod_name}-component", -+ "deployment": "{pod_name}-deployment", -+ "deploymentconfig": "{pod_name}-dc", -+ "custom.label": "{pod_name}-label-value", -+ "label.with.empty.value":"" -+ }}, -+ "annotations": {{ -+ "k8s.io/deployment-config.latest-version": "1", -+ "k8s.io/deployment-config.name": "{pod_name}-dc", -+ "k8s.io/deployment.name": "{pod_name}-deployment", -+ "k8s.io/custom.name": "custom value", -+ "annotation.with.empty.value":"" -+ }} -+ }}, -+ "status": {{ -+ "phase": "Running", -+ "hostIP": "172.18.4.32", -+ "podIP": "10.128.0.14", -+ "startTime": "2018-04-09T21:57:39Z" -+ }} -+}}''' -+ -+class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): -+ -+ def do_GET(self): -+ # "http://localhost:18443/api/v1/namespaces/namespace-name2" -+ # parse url - either /api/v1/namespaces/$ns_name -+ # or -+ # /api/v1/namespaces/$ns_name/pods/$pod_name -+ comps = self.path.split('/') -+ status = 400 -+ if len(comps) >= 5 and comps[1] == 'api' and comps[2] == 'v1': -+ if len(comps) == 5 and comps[3] == 'namespaces': # namespace -+ resp = ns_template.format(namespace_name=comps[4]) -+ status = 200 -+ elif len(comps) == 7 and comps[3] == 'namespaces' and comps[5] == 'pods': -+ resp = pod_template.format(namespace_name=comps[4], pod_name=comps[6]) -+ status = 200 -+ else: -+ resp = '{{"error":"do not recognize {0}"}}'.format(self.path) -+ else: -+ resp = '{{"error":"do not recognize {0}"}}'.format(self.path) -+ if not status == 200: -+ self.log_error(resp) -+ self.send_response(status) -+ self.end_headers() -+ self.wfile.write(json.dumps(json.loads(resp), separators=(',',':'))) -+ -+port = int(sys.argv[1]) -+ -+httpd = HTTPServer(('localhost', port), SimpleHTTPRequestHandler) -+ -+# write "started" to file named in argv[3] -+with open(sys.argv[3], "w") as ff: -+ ff.write("started\n") -+ -+# write pid to file named in argv[2] -+with open(sys.argv[2], "w") as ff: -+ ff.write('{0}\n'.format(os.getpid())) -+ -+httpd.serve_forever() diff --git a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch deleted file mode 100644 index eaec239c383..00000000000 --- a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c1791ee90fdd8adf219ae3d2b849f5f041284b7c Mon Sep 17 00:00:00 2001 -From: Rich Megginson -Date: Thu, 17 May 2018 18:38:25 -0600 -Subject: [PATCH] mmkubernetes test python must encode response - -https://github.com/rsyslog/rsyslog/issues/2721 -Was not working on python3 - must use `encode()` to convert the -string to a `bytes` object. -Also run the server with python -u to make sure we get the log -output from the kubernetes test server. ---- - tests/mmkubernetes-basic.sh | 2 +- - tests/mmkubernetes_test_server.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh -index 0bbfd08ca..d320c343f 100755 ---- a/tests/mmkubernetes-basic.sh -+++ b/tests/mmkubernetes-basic.sh -@@ -4,7 +4,7 @@ - . $srcdir/diag.sh init - - testsrv=mmk8s-test-server --python ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 & -+python -u ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 & - BGPROCESS=$! - . $srcdir/diag.sh wait-startup $testsrv - echo background mmkubernetes_test_server.py process id is $BGPROCESS -diff --git a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py -index 0de215603..24f4e1b0e 100644 ---- a/tests/mmkubernetes_test_server.py -+++ b/tests/mmkubernetes_test_server.py -@@ -104,7 +104,7 @@ def do_GET(self): - self.log_error(resp) - self.send_response(status) - self.end_headers() -- self.wfile.write(json.dumps(json.loads(resp), separators=(',',':'))) -+ self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')).encode()) - - port = int(sys.argv[1]) - diff --git a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild deleted file mode 100644 index 71ff1a67191..00000000000 --- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild +++ /dev/null @@ -1,440 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) - -inherit autotools eutils linux-info python-any-r1 systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - KEYWORDS="amd64 arm ~arm64 hppa x86" - - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " - - PATCHES=( - "${FILESDIR}"/${PN}-8.35.0-fix-issue2719.patch - "${FILESDIR}"/${PN}-8.35.0-fix-issue2726.patch - ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql" -IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.8:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - curl? ( >=net-misc/curl-7.35.0 ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - kubernetes? ( >=net-misc/curl-7.35.0 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( virtual/libmysqlclient:= ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.3:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.14:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/czmq-3.0.2 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - test? ( - jemalloc? ( /dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -}