[gentoo-commits] repo/gentoo:master commit in: dev-python/flower/files/, dev-python/flower/

[gentoo-commits] repo/gentoo:master commit in: dev-python/flower/files/, dev-python/flower/

[Zac Medico]

commit:     17c6bd2cb7b20096c3fd4472e84b9195e2fd326e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 18:56:26 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 18:57:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c6bd2c

dev-python/flower: install script in /usr/libexec/flower for bug 578444

Package-Manager: portage-2.2.28

 dev-python/flower/files/flower.initd   | 2 +-
 dev-python/flower/files/flower.service | 2 +-
 dev-python/flower/flower-0.8.4.ebuild  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/flower/files/flower.initd b/dev-python/flower/files/flower.initd
index bd2008f..8464cd2 100644
--- a/dev-python/flower/files/flower.initd
+++ b/dev-python/flower/files/flower.initd
@@ -8,7 +8,7 @@ pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
 user=${SVCNAME}
 group=${SVCNAME}
 
-command="/usr/bin/${SVCNAME}"
+command="/usr/libexec/${SVCNAME}/${SVCNAME}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \

diff --git a/dev-python/flower/files/flower.service b/dev-python/flower/files/flower.service
index 5220d89..dd2f1d9 100644
--- a/dev-python/flower/files/flower.service
+++ b/dev-python/flower/files/flower.service
@@ -7,7 +7,7 @@ After=network-online.target
 User=flower
 PrivateDevices=Yes
 Environment=_FLOWER_OPTS="--conf=/etc/flower/config.py"
-ExecStart=/usr/bin/flower $_FLOWER_OPTS
+ExecStart=/usr/libexec/flower/flower $_FLOWER_OPTS
 
 [Install]
 WantedBy=multi-user.target

diff --git a/dev-python/flower/flower-0.8.4.ebuild b/dev-python/flower/flower-0.8.4.ebuild
index bbbeb2a..2feb9ea 100644
--- a/dev-python/flower/flower-0.8.4.ebuild
+++ b/dev-python/flower/flower-0.8.4.ebuild
@@ -46,6 +46,10 @@ src_install() {
 	fowners ${PN}:${PN} /var/log/${PN}
 }
 
+python_install() {
+	distutils-r1_python_install --install-scripts "${EPREFIX}/usr/libexec/flower"
+}
+
 python_test() {
 	esetup.py test || die
 }

[gentoo-commits] repo/gentoo:master commit in: dev-python/flower/files/, dev-python/flower/

[Zac Medico]

commit:     1aec3789256b0a58e8cefd3248a3954a79b7c7b9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 19:07:22 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 19:08:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aec3789

dev-python/flower: add logrotate config

Package-Manager: portage-2.2.28

 dev-python/flower/files/flower.logrotated | 7 +++++++
 dev-python/flower/flower-0.8.4.ebuild     | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/dev-python/flower/files/flower.logrotated b/dev-python/flower/files/flower.logrotated
new file mode 100644
index 0000000..7a0ce64
--- /dev/null
+++ b/dev-python/flower/files/flower.logrotated
@@ -0,0 +1,7 @@
+/var/log/flower/flower.log {
+	su flower flower
+	missingok
+	size 5M
+	rotate 3
+	compress
+}

diff --git a/dev-python/flower/flower-0.8.4.ebuild b/dev-python/flower/flower-0.8.4.ebuild
index 2feb9ea..4a2a0e7 100644
--- a/dev-python/flower/flower-0.8.4.ebuild
+++ b/dev-python/flower/flower-0.8.4.ebuild
@@ -44,6 +44,8 @@ src_install() {
 	systemd_dounit "${FILESDIR}/${PN}.service"
 	keepdir /var/log/${PN}
 	fowners ${PN}:${PN} /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
 }
 
 python_install() {

[gentoo-commits] repo/gentoo:master commit in: dev-python/flower/files/, dev-python/flower/

[Zac Medico]

commit:     54fcfe2d700b35705ce973ef2dab40212854b3b3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 23:53:20 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 23:53:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fcfe2d

dev-python/flower: revbump to 0.9.1-r1 for bug 631020

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-python/flower/files/flower.initd                 | 20 ++++++--------------
 .../{flower-0.9.1.ebuild => flower-0.9.1-r1.ebuild}  |  0
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/dev-python/flower/files/flower.initd b/dev-python/flower/files/flower.initd
index e224de13aeb..1f950c6d210 100644
--- a/dev-python/flower/files/flower.initd
+++ b/dev-python/flower/files/flower.initd
@@ -1,23 +1,15 @@
 #!/sbin/openrc-run
-# Copyright 2015 Gentoo Foundation
+# Copyright 2015-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Real-time monitor and web admin for Celery distributed task queue"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${SVCNAME}
-group=${SVCNAME}
-
-command="/usr/libexec/${SVCNAME}/${SVCNAME}"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+command="/usr/libexec/${RC_SVCNAME}/${RC_SVCNAME}"
+command_user="${RC_SVCNAME}"
 command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+start_stop_daemon_args="--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
 
 depend() {
 	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
 }

diff --git a/dev-python/flower/flower-0.9.1.ebuild b/dev-python/flower/flower-0.9.1-r1.ebuild
similarity index 100%
rename from dev-python/flower/flower-0.9.1.ebuild
rename to dev-python/flower/flower-0.9.1-r1.ebuild