X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-ua0-f178.google.com (mail-ua0-f178.google.com [209.85.217.178]) by lists.alpinelinux.org (Postfix) with ESMTP id DB57B5C4260 for ; Tue, 7 Feb 2017 10:50:01 +0000 (GMT) Received: by mail-ua0-f178.google.com with SMTP id 96so81588999uaq.3 for ; Tue, 07 Feb 2017 02:50:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Q/KrRJ7r4nvUoR4n+Bfjfh5uqcyXcNTYKmN5kIdntz0=; b=AKMGL41FTJ0OyF4I01tP3aapyVUXKNdmPVzTaO/gTxM2H3txxV6j0rk8Pq1Kh3i11w x/jmHJ9t49gcZ6Jr5DIvvATu6kv+oNn3bAuYQTh8480Xb9hN3gh0MaqOp7cP9Q3aGued 0LBu1MUyk1csYCt7oLCoZcyWeU0WWKKLtYgebbWIYxIKxITThAUVFtElxTH6rFBiHJIE ORB5KBLyi/lcPY+HID3mfyPB7N1YO9XEJEj6yEheQ8CZo/lyD3BLQv0rrcK+W5taN/4i //CoVCqTrITIwWpFtoRcHkngoGcKntWF6jjxOZlkGZ2ptuPdpJuVjCVmxokrn0f1DYYJ V6qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Q/KrRJ7r4nvUoR4n+Bfjfh5uqcyXcNTYKmN5kIdntz0=; b=i7rKLGPHkoPo2g5WeSw/BJNP+9JaFlipDjV/i6Yy1us9vhB0ImMzlVcgGmBSkwMQ0C 6S24YMcmfj8LNHz98ExYfeRQcge/8y0EEKx2CUN/BZK8IgvaCzjdSZ2eWXMOeJYPXP2P 2dHv9NMficCa6R8pQZFLpfG4aSb8oD5/WplwuyRIFhiUk83tzAbzbEmdQeNeD0KLBFKO W9Hp1S5093mvrUaVkj+ln6nEa2wPS4mR3BHiLk33itzmVNb0lyLU2xxwJeZdapUiRG70 mReMUyt0Q7wwxAa1VQvPW1BlNnQGtIOFD/Oj61gBIR+WS2E3o5C/hUSSCWt3DZzN8K/v Xd9A== X-Gm-Message-State: AIkVDXK7TzszJspY1yTEvbf7Zs+vdlNRrsv31DbxF8VGGuV1j1Tn4LgQFUGfz/TYee9awjmzmq9LaLl64rQA5Q== X-Received: by 10.176.0.143 with SMTP id 15mr6313504uaj.22.1486464601329; Tue, 07 Feb 2017 02:50:01 -0800 (PST) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Received: by 10.31.140.138 with HTTP; Tue, 7 Feb 2017 02:50:00 -0800 (PST) Received: by 10.31.140.138 with HTTP; Tue, 7 Feb 2017 02:50:00 -0800 (PST) In-Reply-To: References: <20170203164907.3029-1-valery.kartel@gmail.com> <1486461706.11710.295.camel@gmail.com> From: Valery Kartel Date: Tue, 7 Feb 2017 12:50:00 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH v2] main/cacti: upgrade to 1.0.0 To: Leonardo Arena Cc: alpine-aports Content-Type: multipart/alternative; boundary=001a113d729e8897720547ee82dd --001a113d729e8897720547ee82dd Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable yes, it's a good idea. I'll make a new patch later 7 =D1=84=D0=B5=D0=B2=D1=80. 2017 =D0=B3. 12:01 =D0=BF=D0=BE=D0=BB=D1=8C=D0= =B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C "Leonardo Arena" =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB: Hi, On ven, 2017-02-03 at 18:49 +0200, Valery Kartel wrote: > --- > v1: > > 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: > > 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*) > --- > main/cacti/APKBUILD | 136 > ++++++++++++++++++++++++++++++------ > main/cacti/cacti-setup.post-install | 20 ++++++ > main/cacti/cacti.nginx.conf | 36 ++++++++++ > main/cacti/cacti.php-fpm.conf | 15 ++++ > main/cacti/cacti.pre-install | 9 +++ > 5 files changed, 195 insertions(+), 21 deletions(-) > create mode 100644 main/cacti/cacti-setup.post-install > create mode 100644 main/cacti/cacti.nginx.conf > create mode 100644 main/cacti/cacti.php-fpm.conf > create mode 100644 main/cacti/cacti.pre-install > > 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 > # Maintainer: Jeff Bilyk > -_php=3Dphp5 > pkgname=3Dcacti > -pkgver=3D0.8.8h > +pkgver=3D1.0.0 > pkgrel=3D0 > -pkgdesc=3D"Network monitoring tool based on RRDtool" > +pkgdesc=3D"The complete rrdtool-based graphing solution" > url=3D"http://www.cacti.net" > arch=3D"noarch" > license=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" > makedepends=3D"" > +subpackages=3D"$pkgname-doc $pkgname-lang $pkgname-setup \ > + $pkgname-php5:_php $pkgname-php7:_php > + " > +install=3D"$pkgname.pre-install $pkgname-setup.post-install" > source=3D"http://www.cacti.net/downloads/$pkgname-$pkgver.tar.gz > + $pkgname.nginx.conf > + $pkgname.php-fpm.conf > " > +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 > +} > 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 --001a113d729e8897720547ee82dd Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
yes, it's a good idea. I'll make a new patch late= r

7 =D1=84= =D0=B5=D0=B2=D1=80. 2017 =D0=B3. 12:01 =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE= =D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C "Leonardo Arena" <rnalrd@gmail.com> =D0=BD=D0=B0=D0=BF=D0= =B8=D1=81=D0=B0=D0=BB:
Hi,=

On ven, 2017-02-03 at 18:49 +0200, Valery Kartel wrote:
> ---
> v1:
>
> 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:
>
> 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 ++++++<= br> > =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
>
> 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
> -=C2=A0 =C2=A0 =C2=A0${_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 \
> +=C2=A0 =C2=A0 =C2=A0$pkgname-php5:_php $pkgname-php7:_php
> +=C2=A0 =C2=A0 =C2=A0"
> +install=3D"$pkgname.pre-install $pkgname-setup.post-install"= ;
> =C2=A0source=3D"http://www.cacti.net= /downloads/$pkgname-$pkgver.tar.gz
> +=C2=A0 =C2=A0 =C2=A0$pkgname.nginx.conf
> +=C2=A0 =C2=A0 =C2=A0$pkgname.php-fpm.conf
> =C2=A0=C2=A0 =C2=A0 =C2=A0"
> +builddir=3D"$srcdir/$pkgname-$pkgver"
> +
> +package() {
> +=C2=A0 =C2=A0 =C2=A0cd "$builddir"
> +
> +=C2=A0 =C2=A0 =C2=A0mkdir -p "$pkgdir"/usr/share/webapps/$<= wbr>pkgname \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$pkgdir"/v= ar/lib/$pkgname
> +
> +=C2=A0 =C2=A0 =C2=A0cp -r * "$pkgdir"/usr/share/webapps/$pkgname/ || return 1
> +
> +=C2=A0 =C2=A0 =C2=A0# remove development data
> +=C2=A0 =C2=A0 =C2=A0rm -fr "$pkgdir"/usr/share/webapps/$pkgname/locales/po \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$pkgdir"/u= sr/share/webapps/$pkgname/locales/update-
> pot.sh
> +
> +=C2=A0 =C2=A0 =C2=A0# switch to system fonts
> +=C2=A0 =C2=A0 =C2=A0rm -fr "$pkgdir"/usr/share/webapps/$pkgname/include/fonts
> +=C2=A0 =C2=A0 =C2=A0ln -s /usr/share/fonts/ttf-dejavu \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$pkgdir"/v= ar/lib/$pkgname/fonts
> +=C2=A0 =C2=A0 =C2=A0ln -s /var/lib/$pkgname/fonts \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$pkgdir"/u= sr/share/webapps/$pkgname/include/fonts
> +
> +=C2=A0 =C2=A0 =C2=A0# symlink to help webserver find relative path > +=C2=A0 =C2=A0 =C2=A0ln -s . "$pkgdir"/usr/share/webapps/$pkgname/$pkgname
> +
> +=C2=A0 =C2=A0 =C2=A0# move variable and writable data to cacti's = home
> +=C2=A0 =C2=A0 =C2=A0local dir; for dir in cache log plugins resource = rra
> scripts; do
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"= ;/usr/share/webapps/$pkgname/$dir \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0"$pkgdir"/var/lib/$pkgname/$dir || return 1
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0chown -R $pkgusers:$p= kggroups
> "$pkgdir"/var/lib/$pkgname/$dir
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ln -s /var/lib/$pkgna= me/$dir
> "$pkgdir"/usr/share/webapps/$pkgname/$dir
> +=C2=A0 =C2=A0 =C2=A0done
> +
> +=C2=A0 =C2=A0 =C2=A0# move config to cacti's home
> +=C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/share/webapps/$pk= gname/include/config.php \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$pkgdir"/v= ar/lib/$pkgname/config.php || return 1
> +=C2=A0 =C2=A0 =C2=A0ln -s /var/lib/$pkgname/config.php \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$pkgdir"/u= sr/share/webapps/$pkgname/include/config.
> php
> +}
>

can the configuration be moved into /etc/cacti, so that it goes into<= br> LBU by default?

We do this already with other web packages like roundcube, nextcloud,
etc.

|_eo


--001a113d729e8897720547ee82dd-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---