From 22ee95b07ecdcc1c281374676320f52fb9efe484 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 8 Feb 2019 16:53:50 +0100 Subject: [PATCH] www-apps/pleroma-installer: Version 3 Added syslog useflag and fixed upgrade script for systemd Package-Manager: Portage-2.3.51, Repoman-2.3.11 Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07 --- www-apps/pleroma-installer/Manifest | 10 +++++----- ...a-installer-2.ebuild => pleroma-installer-3.ebuild} | 10 ++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) rename www-apps/pleroma-installer/{pleroma-installer-2.ebuild => pleroma-installer-3.ebuild} (86%) diff --git a/www-apps/pleroma-installer/Manifest b/www-apps/pleroma-installer/Manifest index 694a55a..4d17f21 100644 --- a/www-apps/pleroma-installer/Manifest +++ b/www-apps/pleroma-installer/Manifest @@ -3,12 +3,12 @@ Hash: SHA256 AUX install_pleroma.sh 1219 BLAKE2B d97ea44cd608ff0528134093f17bbea2aada5ed57ad69444a7847a924a4b4368055116ff8cf46b2ba7c423c6adc0adedb5179e1f9729cb28f6b2bbd495daab25 SHA512 f4c24ac6547924787f7ef033d75748f4e30657ff1d84aaaffdeb40f17f21adaaa581335e894bbb0009b119a759637af00ed9cd4667dfcdeac886916c5c08b017 AUX upgrade_pleroma.sh 791 BLAKE2B 3123e3bcc06bab422a554eeb9c5da6b100107125d16e9a661c90b1c09d1f4b8fd5cbdc743ed521db0ba7593a4967bd384695834d1951fa84ca2dd802773e31c1 SHA512 d08ffce3cfeba971022c0e1f9a08daffc10e60fa8d7920d99a840bbe7744d487d064e9d641f57ff89db77ba9c5fe0fd51999cce112ef7e8a2c1a5bf5a8c021ad -EBUILD pleroma-installer-2.ebuild 1916 BLAKE2B f9cba74c7d34167d67f12aeace2f52a1d6160d0fc3f6839bc864b32b77a4abd52bb336e93090edb3d06fc374d3db37a260926a3ec71d1677673e9e66ac58dc58 SHA512 eadac3be76061c4921b09fdb4f804ca33d8e8ad75de3a67c83a52f474d1659476c73fcee73e9452dc0103c670a453a45a8ff1d7abb5f5f86cab76ec0742a85e3 +EBUILD pleroma-installer-3.ebuild 2158 BLAKE2B 2213eef46091559f91daca741a587c125022acd2a2fd282cc404186f5a9dfc1e4d8ec87d4ec28757b97dd9f07d0b382df4feca4202ee3cc874836cbecae3ce75 SHA512 513404327aad3413213720b45f80cf9846e3d22cb6082385c7630a107826ef7722bfa10c1a0b2fa761637e3de09858698da73a2446783987d2a23c1b1695b125 MISC metadata.xml 993 BLAKE2B adc5c72fe12b6fdb4eb20c1d79dde227b088b437ffd21d16cc5775fa5bb7fa6363890dd5017fbe7f5a00a794a38fb298ce17e6402f6d3d5441985effd0d7e1db SHA512 6ff23fa60c0f22ef7a433e3d1b4919d074508898504b7168c925da8840f542afcdc891a9f4df69dc8eb6c44b7d9c41e6b94fdecd404ca738169124bcdab0af0d -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXFr0dgAKCRDPw5SX8bJu -BzwiAP4s+/d3FdpOZsIFtEy5ral89yVZ0YPxxaTU7Kf2gFv4NwD7BWdfco/c4w3+ -Kc2p36+snjyyVqTSpiZ/4nyMv2AOh84= -=PFAI +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXF2l/gAKCRDPw5SX8bJu +BxuMAP4xN+LrRBhBhEkk/HOKgsGbECLqn6hdtvmR1StYQb8D0AD9GTI+bCyR8Hvo +OnxADFel7XpofeM+6dFZP6aQzrN6yMI= +=uVQF -----END PGP SIGNATURE----- diff --git a/www-apps/pleroma-installer/pleroma-installer-2.ebuild b/www-apps/pleroma-installer/pleroma-installer-3.ebuild similarity index 86% rename from www-apps/pleroma-installer/pleroma-installer-2.ebuild rename to www-apps/pleroma-installer/pleroma-installer-3.ebuild index cb2212c..3062fa2 100644 --- a/www-apps/pleroma-installer/pleroma-installer-2.ebuild +++ b/www-apps/pleroma-installer/pleroma-installer-3.ebuild @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://git.pleroma.social/pleroma/pleroma.git" LICENSE="AGPL-3" SLOT="0" KEYWORDS="" -IUSE="apache +nginx systemd" +IUSE="apache +nginx syslog systemd" RDEPEND=" >=dev-lang/elixir-1.6.6 @@ -30,11 +30,17 @@ pkg_setup() { src_prepare() { default - if ! use systemd; then + + if use syslog; then # Log to syslog sed -i 's/command_background=1/command_background=1\nerror_logger="logger"\noutput_logger="logger"/' \ installation/init.d/pleroma || die fi + + if use systemd; then + sed -i 's|/etc/init.d/pleroma stop|systemctl stop pleroma|' "${FILESDIR}/upgrade_pleroma.sh" || die + sed -i 's|/etc/init.d/pleroma restart|systemctl restart pleroma|' "${FILESDIR}/upgrade_pleroma.sh" || die + fi } src_install() {