From e0cf7dca2a8de7df70153582c638d3a1110b2286 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 31 May 2012 09:28:48 +0200
Subject: [PATCH] =?UTF-8?q?expand-template=20la=20conf=20avant=20le=20d?=
 =?UTF-8?q?=C3=A9marrage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/var/service/ntop/run | 2 ++
 smeserver-ntop.spec       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/root/var/service/ntop/run b/root/var/service/ntop/run
index 231601c..985bb70 100644
--- a/root/var/service/ntop/run
+++ b/root/var/service/ntop/run
@@ -4,5 +4,7 @@ exec 2>&1
 
 [ -e /var/lib/ntop/ntop_pw.db ] || exec /usr/sbin/ntop --set-admin-password=admin
 
+/sbin/e-smith/expand-template /etc/ntop.conf
+
 exec /usr/sbin/ntop @/etc/ntop.conf
 
diff --git a/smeserver-ntop.spec b/smeserver-ntop.spec
index 44d7a34..b852a27 100644
--- a/smeserver-ntop.spec
+++ b/smeserver-ntop.spec
@@ -29,6 +29,7 @@ to run ntop on your SME Server
 %changelog
 * Thu May 31 2012 Daniel B. <daniel@firewall-services.com> 0.1.0-1
 - Move to GIT
+- Expand conf before startup
 
 * Tue Feb 21 2012 Daniel B. <daniel@firewall-services.com> 0.1-6
 - Expand ntop conf in bootstrap-console-save