From 8d0ab23446a537590f90fb38b7d4e9cfd9058421 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 28 Jun 2019 21:34:42 +0200 Subject: [PATCH] www-apps/pleroma-installer: Changed description. Package-Manager: Portage-2.3.66, Repoman-2.3.11 Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07 --- www-apps/pleroma-installer/Manifest | 12 +-- .../pleroma-installer-4.ebuild | 91 ------------------ .../pleroma-installer-5.ebuild | 92 ------------------- .../pleroma-installer-6.ebuild | 4 +- 4 files changed, 6 insertions(+), 193 deletions(-) delete mode 100644 www-apps/pleroma-installer/pleroma-installer-4.ebuild delete mode 100644 www-apps/pleroma-installer/pleroma-installer-5.ebuild diff --git a/www-apps/pleroma-installer/Manifest b/www-apps/pleroma-installer/Manifest index 5d1e585..72cd61f 100644 --- a/www-apps/pleroma-installer/Manifest +++ b/www-apps/pleroma-installer/Manifest @@ -5,14 +5,12 @@ AUX install_pleroma-r1.sh 1361 BLAKE2B d6bf84e9c84a7953fdd9d5b5ebcb0834aeecfbee6 AUX install_pleroma.sh 1297 BLAKE2B efa93ff38d80202fcfe716a6fd4d3fc85882747acedd582fcafa03eafd6bf4d870f521525430c6c688fc13ae39da89ad8f3bc12c50a96b0e5e91e4cd5c5cb193 SHA512 a33fd3da78bd5c0db8e2dd92a8d7640b5bfab90b485d4d47f678b4ce1c86b92995c741a5aa9ab82dec4538469dc30d7cf6755691103a27057b3afabb2f42e1f2 AUX upgrade_pleroma-r1.sh 852 BLAKE2B 2442d34fd1ba5d551c22e8f4cac319ac562022a40d03102aba038c5d807576445bf8189ccb7a11a42788ff8d2783eba32120c23b1483874cd70089612aa739c7 SHA512 c7269115af94fec0cac211ed795425a5a2f6f8b3acfe9212169d9e444751354e52b2fab427aafcfa152903ea98dd6de133839be9a92e5ad8f6236534f74a44f9 AUX upgrade_pleroma.sh 791 BLAKE2B 3123e3bcc06bab422a554eeb9c5da6b100107125d16e9a661c90b1c09d1f4b8fd5cbdc743ed521db0ba7593a4967bd384695834d1951fa84ca2dd802773e31c1 SHA512 d08ffce3cfeba971022c0e1f9a08daffc10e60fa8d7920d99a840bbe7744d487d064e9d641f57ff89db77ba9c5fe0fd51999cce112ef7e8a2c1a5bf5a8c021ad -EBUILD pleroma-installer-4.ebuild 2614 BLAKE2B 429cc8e36e763aed3349b9d2496387cb503a6aba0d108fcf72a8eb50ebb5272fa5c5bf4bb0ef3144c85fc5e1792397f53a8fe427444ee99b65286a897c0a2a47 SHA512 251a8a4851cff0e565ab14b5c6999fe0208115e3337f04b550acc4dc61d9113e9182002c4fcb3103a91bb183818ea97a9601988c190b4b64d303ca75344b4609 -EBUILD pleroma-installer-5.ebuild 2567 BLAKE2B f3768a19e70602a8945440685ffeb0fb20f6c9d2f60db2bea5e0a141c28d9d56432d07b15c25402b12385bd1e20b4329647c936b4659afa3182b94f82121c634 SHA512 935e548e224e9480f48e378a37c8a6b6e42ec234720c0846d8f89e09c0d19db80a1ebbe2991237f8fe4ba696c5941e8b9ea802fef4fdc831d156b7ec3ab2ca1f -EBUILD pleroma-installer-6.ebuild 2295 BLAKE2B f8cae60ff5a9b7a39dbd497b9d52bfd0fb9b73c4b87970d8e2de7decce65e936f67c304bc4d19980b135a0abc3837f65460cd7f0062b264421656ee7e155c9a8 SHA512 fe1bb75eec5ef123c2788e20be4b54d798e2bfa8799581cf60867ac498322d9df34db7cf49948f84021f2eec28f1be5629db468f8a26fa4b9c55f377e81ae710 +EBUILD pleroma-installer-6.ebuild 2081 BLAKE2B 957d0d11d2966b886820f11d93be91badbf6ac260b3eeb817293b06b3dee71f745e2bf77b06996f22d889e0f499377200b3b65ea76eb8623bb5821e9cf584a2e SHA512 2722fd17a0e729434c9a475981f47cdf831ce11f84902f58e8ec951ec7bd2018f9282179bd02edec9a1fbcaae721c57ba0786342a68335db20b5f89f612cfae2 MISC metadata.xml 993 BLAKE2B adc5c72fe12b6fdb4eb20c1d79dde227b088b437ffd21d16cc5775fa5bb7fa6363890dd5017fbe7f5a00a794a38fb298ce17e6402f6d3d5441985effd0d7e1db SHA512 6ff23fa60c0f22ef7a433e3d1b4919d074508898504b7168c925da8840f542afcdc891a9f4df69dc8eb6c44b7d9c41e6b94fdecd404ca738169124bcdab0af0d -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXL83cQAKCRDPw5SX8bJu -B5BHAP9w2ylRur4p6HuaUvrH1l0Ip+GThCfFD8xxnfGFNvPx6gEAhq1ugEeDSLGa -RpqSPkJV60Ad7jCGx8ifaDX+oIdbDMc= -=uSG4 +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXRZrxwAKCRDPw5SX8bJu +B8oeAP9UEYtZlSOVCP7Yl3RzxPgv67kSDQL7gEyJeZpvvIte1AD8DhogCrawMyiW +ICSXKc7mkymfOhvk6ZWi2JmcNmNGCTg= +=jqHH -----END PGP SIGNATURE----- diff --git a/www-apps/pleroma-installer/pleroma-installer-4.ebuild b/www-apps/pleroma-installer/pleroma-installer-4.ebuild deleted file mode 100644 index 0135f39..0000000 --- a/www-apps/pleroma-installer/pleroma-installer-4.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit git-r3 user systemd - -DESCRIPTION="Microblogging server software that can federate with other servers." -HOMEPAGE="https://pleroma.social/ https://git.pleroma.social/pleroma/pleroma/" -EGIT_REPO_URI="https://git.pleroma.social/pleroma/pleroma.git" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="" -IUSE="apache +nginx syslog systemd" - -RDEPEND=" - >=dev-lang/elixir-1.6.6 - dev-vcs/git - >=dev-db/postgresql-9.6.11[uuid] - app-admin/sudo - apache? ( www-servers/apache ) - nginx? ( www-servers/nginx[nginx_modules_http_slice] ) -" -DEPEND="" - -pkg_setup() { - enewgroup pleroma - enewuser pleroma -1 /bin/bash /var/lib/pleroma pleroma -} - -src_prepare() { - default - - 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() { - local pleromadir="${EPREFIX}/opt/pleroma" - diropts -o pleroma -g pleroma - exeopts -o pleroma -g pleroma - - dodir "${pleromadir}" - dosym "${EPREFIX}/opt/pleroma" "${EPREFIX}/var/lib/pleroma/pleroma" - exeinto "${pleromadir}" - doexe "${FILESDIR}/install_pleroma.sh" - doexe "${FILESDIR}/upgrade_pleroma.sh" - - if use nginx; then - dodoc installation/pleroma.nginx - fi - if use apache; then - dodoc installation/pleroma-apache.conf - fi - - dodoc docs/* - - if use systemd; then - systemd_dounit installation/pleroma.service - else - doinitd installation/init.d/pleroma - fi -} - -pkg_preinst() { - ewarn "This ebuild installs an installation script for the development-branch of Pleroma." - ewarn "If you want a stabler version, install www-apps/pleroma." - ewarn "Beginning with 2019-02-10, the Pleroma init scripts expect the installation in ${EPREFIX}/opt/pleroma." - ewarn "If it is in ${EPREFIX}/var/lib/pleroma, this ebuild will fail. Move it now and remerge." -} - -pkg_postinst() { - elog 'For the initial installation, become the user pleroma, cd to ${HOME}/pleroma and run ./install_pleroma.sh.' - elog "To upgrade, run ./upgrade_pleroma.sh." - elog "Make sure the user pleroma can use sudo and has a strong password." - if use nginx; then - einfo "An example config for nginx has been installed in the doc directory." - fi - if use apache; then - einfo "An example config for apache has been installed in the doc directory." - fi -} diff --git a/www-apps/pleroma-installer/pleroma-installer-5.ebuild b/www-apps/pleroma-installer/pleroma-installer-5.ebuild deleted file mode 100644 index f29c0ae..0000000 --- a/www-apps/pleroma-installer/pleroma-installer-5.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit git-r3 user systemd - -DESCRIPTION="Microblogging server software that can federate with other servers." -HOMEPAGE="https://pleroma.social/ https://git.pleroma.social/pleroma/pleroma/" -EGIT_REPO_URI="https://git.pleroma.social/pleroma/pleroma.git" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="" -IUSE="apache +nginx syslog systemd" - -RDEPEND=" - >=dev-lang/elixir-1.6.6 - dev-vcs/git - >=dev-db/postgresql-9.6.11[uuid] - app-admin/sudo - apache? ( www-servers/apache ) - nginx? ( www-servers/nginx ) -" -DEPEND="" - -pkg_preinst() { - ewarn "This ebuild installs an installation script for the development-branch of Pleroma." - ewarn "If you want a stabler version, install www-apps/pleroma." - ewarn "Beginning with 2019-02-10, the Pleroma init scripts expect the installation in ${EPREFIX}/opt/pleroma." - ewarn "If it is in ${EPREFIX}/var/lib/pleroma, this ebuild will fail. Move it now and remerge." -} - -pkg_setup() { - enewgroup pleroma - enewuser pleroma -1 -1 /opt/pleroma pleroma -} - -src_prepare() { - default - - sed -i 's|directory=~pleroma/pleroma|directory=~pleroma|' \ - "${S}/installation/init.d/pleroma" || die - - 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() { - local pleromadir="${EPREFIX}/opt/pleroma" - diropts -o pleroma -g pleroma - exeopts -o pleroma -g pleroma - - dodir "${pleromadir}" - exeinto "${pleromadir}" - newexe "${FILESDIR}/install_pleroma-r1.sh" install_pleroma.sh - newexe "${FILESDIR}/upgrade_pleroma-r1.sh" upgrade_pleroma.sh - - if use nginx; then - dodoc installation/pleroma.nginx - fi - if use apache; then - dodoc installation/pleroma-apache.conf - fi - - dodoc docs/* - - if use systemd; then - systemd_dounit installation/pleroma.service - else - doinitd installation/init.d/pleroma - fi -} - -pkg_postinst() { - elog "For the initial installation, cd to ${EPREFIX}/opt/pleroma and run ./install_pleroma.sh." - elog "To upgrade, run ./upgrade_pleroma.sh." - if use nginx; then - einfo "An example config for nginx has been installed in the doc directory." - fi - if use apache; then - einfo "An example config for apache has been installed in the doc directory." - fi -} diff --git a/www-apps/pleroma-installer/pleroma-installer-6.ebuild b/www-apps/pleroma-installer/pleroma-installer-6.ebuild index 9a68315..0b3b283 100644 --- a/www-apps/pleroma-installer/pleroma-installer-6.ebuild +++ b/www-apps/pleroma-installer/pleroma-installer-6.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit git-r3 user systemd -DESCRIPTION="Microblogging server software that can federate with other servers." +DESCRIPTION="Federating microblogging server software. Development version." HOMEPAGE="https://pleroma.social/ https://git.pleroma.social/pleroma/pleroma/" EGIT_REPO_URI="https://git.pleroma.social/pleroma/pleroma.git" @@ -27,8 +27,6 @@ DEPEND="" pkg_preinst() { ewarn "This ebuild installs an installation script for the development-branch of Pleroma." ewarn "If you want a stabler version, install www-apps/pleroma." - ewarn "Beginning with 2019-02-10, the Pleroma init scripts expect the installation in ${EPREFIX}/opt/pleroma." - ewarn "If it is in ${EPREFIX}/var/lib/pleroma, this ebuild will fail. Move it now and remerge." } pkg_setup() {