--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/28 13:14:07	1.12
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/28 15:38:40	1.13
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.11 2008/08/28 10:12:16 snetram Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.12 2008/08/28 13:14:07 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: Coova-Chilli, a captive portal
 %define name smeserver-coova-chilli
 Name: %{name}
 %define version 0.1
-%define release 6
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -41,7 +41,10 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
-*Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
+* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
+- Reverted moving of default db entries to SPEC file since common practice is to store them in files
+
+* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
 - split uamallowed (one per line)
 - Add dnsparanoia directive
 - correct cmdsock directive
@@ -91,34 +94,10 @@ This contrib will only work in server&ga
 mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template
 rm -rf root/opt/chilli.rpmnew/
 rm -rf root/etc/e-smith/templates-custom/
-rm -rf root/etc/e-smith/db/configuration/defaults
 
 %build
 /usr/bin/perl createlinks
 
-# Initialise db fragment
-DEFAULT=root/etc/e-smith/db/configuration/defaults/chilli
-mkdir -p $DEFAULT
-echo 'service' 				> $DEFAULT/type
-echo 'disabled' 			> $DEFAULT/status
-echo 'private'				> $DEFAULT/access
-echo '900'				> $DEFAULT/defidletimeout
-echo '7200'				> $DEFAULT/defsessiontimeout
-echo 'eth2'				> $DEFAULT/dhcpif
-echo '212.73.209.226'			> $DEFAULT/dns1
-echo '194.206.120.1'			> $DEFAULT/dns2
-echo '10.1.0.0/255.255.255.0'		> $DEFAULT/net
-echo '3990'				> $DEFAULT/TCPPort
-echo 'tun0'				> $DEFAULT/tundev
-echo 'tcp:www.firewall-services.com:80,\
-	tcp:coova.org:80,\
-	tcp:smeserver.org:80,\
-	tcp:sourceforge.net:80' 	> $DEFAULT/uamallowed
-echo ''					> $DEFAULT/RedirectToChilli
-echo ''					> $DEFAULT/AllowedServices
-echo ''					> $DEFAULT/AllowedOutgoing
-
-
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)