From 69051588e2f955485fe5d45d45e616bc60a2de57 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Jan 2021 18:57:01 +0000 Subject: gentoo resync : 31.01.2021 --- app-emulation/podman/Manifest | 5 +++-- app-emulation/podman/files/podman.confd | 11 +++++++++++ app-emulation/podman/files/podman.initd | 11 +++++++---- app-emulation/podman/podman-2.2.1.ebuild | 1 + 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 app-emulation/podman/files/podman.confd (limited to 'app-emulation/podman') diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest index afbe959f9e03..2a20c8e835eb 100644 --- a/app-emulation/podman/Manifest +++ b/app-emulation/podman/Manifest @@ -1,5 +1,6 @@ -AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04 +AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74dcbd3a6629b2da6f368274b4b664eaaa410773337a1f352c3144c3682ea0ea56b8c958b9d00a6 SHA512 58b05b7ff574f2153d7eeb3f726808e22ebe0821afc4d86dc3dea189944cdd6f2d6e1b051046456e149505b4b558a7957a278c1dba21db2fec65f2efbb3e1d84 +AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45 DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 -EBUILD podman-2.2.1.ebuild 4586 BLAKE2B d79d7aa66ba47059961756df95d9395f2274c777f44200b5b14356d635c2ca4ceabc5c93c088e01e2cf698fffc59a3327ae60697f0f6054d96fb94604aea05d6 SHA512 226474f8b948c6bb9e69d1ea6cde5fa41b076bb012fc9f3fe8092c8e6380d9cd074c529095310a86cc06732939163d0e3befba82d7bb6ce2885d468e77cac0ca +EBUILD podman-2.2.1.ebuild 4630 BLAKE2B 3b1b9931af5d3c3b22bbf25346856528c81daafc71cc501261fcf83b8e17caad1d2174c73a08ce15d9db826cb5868b8a8c5349842f3faf78a1d0e91bd19395a8 SHA512 6dbaa7d5bec77c880797a5d1ce20c9ebbd7ae83cd9a5a307e9e3864d186e21a372b021313433dcff54b6bfd048c9adbeae80dec1ac7dac40dee3ed327d1c79c6 MISC metadata.xml 1160 BLAKE2B d56944aa9a0b3793aa581ea68233ec7b29c7caec3042aae9985d1b228e5ba205a7a631c61d31cef923e38714c934fbaf3202d5a8cf260b78f78fafe81730870e SHA512 0b1e63e5cad075899045c876d6dc93638eb36afd01fb7acef59b59c6795d767f250926cf77789f159481a7efdde09848d2a63fb7452d28ff250146d16a289064 diff --git a/app-emulation/podman/files/podman.confd b/app-emulation/podman/files/podman.confd new file mode 100644 index 000000000000..e997d3b4000e --- /dev/null +++ b/app-emulation/podman/files/podman.confd @@ -0,0 +1,11 @@ +# Config file for /etc/init.d/podman + +# Sets the API service daemon log level +# valid levels: debug, info, warn, error, fatal or panic +#LOG_LEVEL="error" + +# Sets the API service daemon socket +#SOCKET="unix:/run/${RC_SVCNAME}/podman.sock" + +# Configure the user[:group] the API service daemon will run as +#RUN_AS_USER="root:root" diff --git a/app-emulation/podman/files/podman.initd b/app-emulation/podman/files/podman.initd index b590be16a1ba..7adcdab40ea3 100644 --- a/app-emulation/podman/files/podman.initd +++ b/app-emulation/podman/files/podman.initd @@ -1,17 +1,20 @@ #!/sbin/openrc-run -# Copyright 2015-2019 Gentoo Authors +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="Podman Remote API Service" LOG_PATH="/var/log/${RC_SVCNAME}" RUN_PATH="/run/${RC_SVCNAME}" +: ${LOG_LEVEL:=error} +: ${RUN_AS_USER:=root:root} +: ${SOCKET:=unix:/run/${RC_SVCNAME}/podman.sock} pidfile="${RUN_PATH}/${RC_SVCNAME}.pid" command="/usr/bin/podman" -command_args="--log-level debug varlink -t 0 unix:/run/podman/io.podman" +command_args="--log-level ${LOG_LEVEL} system service -t 0 ${SOCKET}" command_background="true" -start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr ${LOG_PATH}/${RC_SVCNAME}.log" +start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr ${LOG_PATH}/${RC_SVCNAME}.log --user ${RUN_AS_USER}" start() { - checkpath -d "${RUN_PATH}" "${LOG_PATH}" + checkpath -o "${RUN_AS_USER}" -d "${RUN_PATH}" "${LOG_PATH}" default_start } diff --git a/app-emulation/podman/podman-2.2.1.ebuild b/app-emulation/podman/podman-2.2.1.ebuild index bca75d6fddbd..32c38f9a7901 100644 --- a/app-emulation/podman/podman-2.2.1.ebuild +++ b/app-emulation/podman/podman-2.2.1.ebuild @@ -114,6 +114,7 @@ src_install() { insinto /usr/share/containers doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json + newconfd "${FILESDIR}"/podman.confd podman newinitd "${FILESDIR}"/podman.initd podman insinto /etc/logrotate.d -- cgit v1.2.3