Message-ID: <1486461706.11710.295.camel@gmail.com>
Subject: Re: [alpine-aports] [PATCH v2] main/cacti: upgrade to 1.0.0
From: Leonardo Arena <rnalrd@gmail.com>
To: Valery Kartel <valery.kartel@gmail.com>, 
	alpine-aports@lists.alpinelinux.org
Date: Tue, 07 Feb 2017 11:01:46 +0100
In-Reply-To: <20170203164907.3029-1-valery.kartel@gmail.com>
References: <20170203164907.3029-1-valery.kartel@gmail.com>
Content-Type: multipart/signed; micalg="pgp-sha256";
	protocol="application/pgp-signature"; boundary="=-WyBsOBrTIgxCL0CBRhQw"
Precedence: list
Mime-Version: 1.0


--=-WyBsOBrTIgxCL0CBRhQw
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi,

On ven, 2017-02-03 at 18:49 +0200, Valery Kartel wrote:
> ---
> v1:
>=20
> create user 'cacti' for php and cli operations
> move writable data to cacti's home /var/lib/cacti
> move all documentaion to -doc
> move installation-related data to -inst subpackage
> add -php5 & -php7 subpackages for autoinstall php dependencies
> fix net-snmp dependency -> net-snmp-tools
> add dependency for cacti-scripts: bash, perl
> ---
> v1 -> v2:
>=20
> add dependency for cacti-scripts: coreutils
> add system ttf-dejavu font instead of bundled one
> move all localisations to -lang subpackage
> rename -inst to -setup and add post-install setup message
> add partial config for nginx (in -doc)
> add config for php-fpm pool (in -php*)
> ---
> =C2=A0main/cacti/APKBUILD=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 136
> ++++++++++++++++++++++++++++++------
> =C2=A0main/cacti/cacti-setup.post-install |=C2=A0=C2=A020 ++++++
> =C2=A0main/cacti/cacti.nginx.conf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0|=C2=A0=C2=A036 ++++++++++
> =C2=A0main/cacti/cacti.php-fpm.conf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0|=C2=A0=C2=A015 ++++
> =C2=A0main/cacti/cacti.pre-install=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0|=C2=A0=C2=A0=C2=A09 +++
> =C2=A05 files changed, 195 insertions(+), 21 deletions(-)
> =C2=A0create mode 100644 main/cacti/cacti-setup.post-install
> =C2=A0create mode 100644 main/cacti/cacti.nginx.conf
> =C2=A0create mode 100644 main/cacti/cacti.php-fpm.conf
> =C2=A0create mode 100644 main/cacti/cacti.pre-install
>=20
> diff --git a/main/cacti/APKBUILD b/main/cacti/APKBUILD
> index 6abe94767d..ea31d21db4 100644
> --- a/main/cacti/APKBUILD
> +++ b/main/cacti/APKBUILD
> @@ -1,38 +1,132 @@
> +# Contributor: Valery Kartel <valery.kartel@gmail.com>
> =C2=A0# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
> -_php=3Dphp5
> =C2=A0pkgname=3Dcacti
> -pkgver=3D0.8.8h
> +pkgver=3D1.0.0
> =C2=A0pkgrel=3D0
> -pkgdesc=3D"Network monitoring tool based on RRDtool"
> +pkgdesc=3D"The complete rrdtool-based graphing solution"
> =C2=A0url=3D"http://www.cacti.net"
> =C2=A0arch=3D"noarch"
> =C2=A0license=3D"GPL2+"
> -depends=3D"$_php ${_php}-mysql ${_php}-snmp rrdtool net-snmp ${_php}-
> sockets
> -	${_php}-xml ${_php}-gd"
> +pkgusers=3D"cacti"
> +pkggroups=3D"www-data"
> +depends=3D"bash perl coreutils net-snmp-tools rrdtool ttf-dejavu"
> =C2=A0makedepends=3D""
> +subpackages=3D"$pkgname-doc $pkgname-lang $pkgname-setup \
> +	$pkgname-php5:_php $pkgname-php7:_php
> +	"
> +install=3D"$pkgname.pre-install $pkgname-setup.post-install"
> =C2=A0source=3D"http://www.cacti.net/downloads/$pkgname-$pkgver.tar.gz
> +	$pkgname.nginx.conf
> +	$pkgname.php-fpm.conf
> =C2=A0	"
> +builddir=3D"$srcdir/$pkgname-$pkgver"
> +
> +package() {
> +	cd "$builddir"
> +
> +	mkdir -p "$pkgdir"/usr/share/webapps/$pkgname \
> +		"$pkgdir"/var/lib/$pkgname
> +
> +	cp -r * "$pkgdir"/usr/share/webapps/$pkgname/ || return 1
> +
> +	# remove development data
> +	rm -fr "$pkgdir"/usr/share/webapps/$pkgname/locales/po \
> +		"$pkgdir"/usr/share/webapps/$pkgname/locales/update-
> pot.sh
> +
> +	# switch to system fonts
> +	rm -fr "$pkgdir"/usr/share/webapps/$pkgname/include/fonts
> +	ln -s /usr/share/fonts/ttf-dejavu \
> +		"$pkgdir"/var/lib/$pkgname/fonts
> +	ln -s /var/lib/$pkgname/fonts \
> +		"$pkgdir"/usr/share/webapps/$pkgname/include/fonts
> +
> +	# symlink to help webserver find relative path
> +	ln -s . "$pkgdir"/usr/share/webapps/$pkgname/$pkgname
> +
> +	# move variable and writable data to cacti's home
> +	local dir; for dir in cache log plugins resource rra
> scripts; do
> +		mv "$pkgdir"/usr/share/webapps/$pkgname/$dir \
> +			"$pkgdir"/var/lib/$pkgname/$dir || return 1
> +		chown -R $pkgusers:$pkggroups
> "$pkgdir"/var/lib/$pkgname/$dir
> +		ln -s /var/lib/$pkgname/$dir
> "$pkgdir"/usr/share/webapps/$pkgname/$dir
> +	done
> +
> +	# move config to cacti's home
> +	mv "$pkgdir"/usr/share/webapps/$pkgname/include/config.php \
> +		"$pkgdir"/var/lib/$pkgname/config.php || return 1
> +	ln -s /var/lib/$pkgname/config.php \
> +		"$pkgdir"/usr/share/webapps/$pkgname/include/config.
> php
> +}
>=20

can the configuration be moved into /etc/cacti, so that it goes into
LBU by default?

We do this already with other web packages like roundcube, nextcloud,
etc.

|_eo


--=-WyBsOBrTIgxCL0CBRhQw
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABCAAGBQJYmZsKAAoJELAPckZGG2T6KJkIAIBQ+qVRB3UPjwgfBEq5XtUG
0IrpWO+X920yH4hPLYJ/PgtdOzvLScIHbqS4tIQeflOzxThuEFGIuDEm4lVO0lkd
jrNKWcBHwfAmoEH8IpQKCUN5oLpWaBg6YIrcTGURGWw0/jXX3cVRTnyJ4ZkZ4lXd
TTo4OPGgAM6KPQWUJlKGqBHHm0iHNkejLKTfcyQqhCwG2ITcQJAs1GkgK/QAolzO
yUopeoftEdkmHT2j3RgSPSrRb4oAMiLf2UwVOqEMHHFMW/lQeaJAo72pFAN26jJ8
LPkS0XrzN9Jkl3o7APJAp1E8V+c8+PNVu+/NCcRPxHjPTQYMGdxVRhx6+R6LLSQ=
=pN2e
-----END PGP SIGNATURE-----

--=-WyBsOBrTIgxCL0CBRhQw--



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---