From 88bbcd650a954324a9d1407ccad754ec5b85ac25 Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Mon, 27 Jul 2015 09:35:40 +0000
Subject: testing/ntopng: allow specifying additional startup options

---
 testing/ntopng/APKBUILD     | 14 +++++++-------
 testing/ntopng/ntopng.confd |  7 +++++++
 testing/ntopng/ntopng.initd |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'testing/ntopng')

diff --git a/testing/ntopng/APKBUILD b/testing/ntopng/APKBUILD
index b024ce8ea1..da7b77048d 100644
--- a/testing/ntopng/APKBUILD
+++ b/testing/ntopng/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=ntopng
 pkgver=2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ntop next-generation"
 url="http://www.ntop.org"
 arch="all"
@@ -62,17 +62,17 @@ package() {
 }
 
 md5sums="f8a20b91372d5daf17ecc6225759010e  ntopng-2.0.tar.gz
-c2c94e8b3cfa92a2aff8254e43b5da21  ntopng.initd
-5600e5f77df5545ba62c46423d8a7848  ntopng.confd
+e164aa08d9923b902dbfac0e857c73ff  ntopng.initd
+6739b2c52d83c79a57c847191a64e69a  ntopng.confd
 a222808fb21e06dbd7e226f137686c3f  ntopng-update-geoip-db
 86dd28e89f09c5d9675d016cb3f880bd  include-sys-types.h.patch"
 sha256sums="3cbfd6de1bc44d65f7c7f0de282d122d11f493f1261ba137c3b5b202e08e0251  ntopng-2.0.tar.gz
-f99b57815e226a998a6f6a6a8ef02a5a780ff0fe476686b3dae56a666f6e719d  ntopng.initd
-c467920b052d031a4e00bfc4a3f384be42bd25dde2a7e7f78b8d1acba25181fa  ntopng.confd
+7275a806b1af6df0224908c86101016f458da4bb746369585195d8a7c60e0e05  ntopng.initd
+4dd1379f68be1daf7bafe0520ba6a508b550f0b0606ef63eb2bc69b8fbf4dbc9  ntopng.confd
 904c7bb855e19b40d2caee076cbd855f96226b9ef681ac440c442094e25acfeb  ntopng-update-geoip-db
 fdb8e063a6596b7d851b429d1d25e3f994882a9233b73e8044836d9b9110bf7f  include-sys-types.h.patch"
 sha512sums="2208623cdc843b8e4ec285930d1ea74ac50c576888fce20f6fc4363e747e0dbef7f1808e7b77ae9b7f5316bca55a3e003a9926785c847bbea2c321d7f7e56d13  ntopng-2.0.tar.gz
-41844e9718c04895f30c8aa5a1776b72311ba3e73b667c21284ed0b9099ae08144722e6aa3ed60364e371755bd82558d1eaa70eb7b781d3afb4c5a07e55345f1  ntopng.initd
-62133e40f62d0df9dd03639d00341c5f5abe6b693f76b56e0e839bf26ec496c61974f29d01367e046345cbb86b6d9d94639f8be2f2d4c50dadd0414a2626158e  ntopng.confd
+58940120a8fe8617e7c0c59036de79b55b52f4e0cb95e6fde9e2991053681fd10884ba263f636bd22c004823b610067244e9815b6df43b1163f6da8c8b50cbc2  ntopng.initd
+bbe7a15e0aec59f12264f39bf33abb67a12b76adac3a6554fcf1e21849aea06fce1e0c0d9831836bd46105a5cc4b3eb780866934d8711386e1cb1218dbdbbe8b  ntopng.confd
 de509706c36e895159b4e57b5fe53f1fa8f32167416aad5fa391ac107f0e7e1a06fa5ce6d92816ef7cb13bf98bb74cb99fa482d03f77a6beb38eafe1d53d2deb  ntopng-update-geoip-db
 1f7c7001adafc6bb2e4bfa5e39421fba0da6df57872af1041616dc58b3cdae817a6f2cf7648d009e47a302c981ab1407987a5f2e37527dc23623343bab34275a  include-sys-types.h.patch"
diff --git a/testing/ntopng/ntopng.confd b/testing/ntopng/ntopng.confd
index 1d38dfeca4..4d11cffe8a 100644
--- a/testing/ntopng/ntopng.confd
+++ b/testing/ntopng/ntopng.confd
@@ -1 +1,8 @@
+### Default options for ntopng
+
+# pidfile="/var/run/ntopng/ntopng.pid"
+# exec_user=ntop
+# command_args="--daemon --data-dir /var/lib/ntopng --httpdocs-dir /usr/share/ntopng/httpdocs --pid $pidfile -U $exec_user"
+
+### Additional options here
 NTOPNG_OPTS=""
diff --git a/testing/ntopng/ntopng.initd b/testing/ntopng/ntopng.initd
index c111d2bf00..824c13a960 100644
--- a/testing/ntopng/ntopng.initd
+++ b/testing/ntopng/ntopng.initd
@@ -7,7 +7,7 @@ depend() {
 command="/usr/bin/ntopng"
 pidfile="/var/run/ntopng/ntopng.pid"
 : ${exec_user:=ntop}
-: ${command_args:="--daemon --data-dir /var/lib/ntopng --httpdocs-dir /usr/share/ntopng/httpdocs --pid $pidfile -U $exec_user"}
+: ${command_args:="--daemon --data-dir /var/lib/ntopng --httpdocs-dir /usr/share/ntopng/httpdocs --pid $pidfile -U $exec_user $NTOPNG_OPTS"}
 
 checkconfig() {
 	if [ ! -e /usr/share/ntopng/httpdocs/geoip/GeoIPASNum.dat ] || \
-- 
cgit v1.2.3