smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec

# $Id: smeserver-coova-chilli.spec,v 1.29 2009/06/11 09:16:08 vip-ire Exp $
# Authority: vip-ire
# Name: Daniel Berteaud

Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server
%define name smeserver-coova-chilli
Name: %{name}
%define version 0.2
%define release 16
Version: %{version}
Release: %{release}%{?dist}
License: GPL
Group: Networking/Remote access
Source: %{name}-%{version}.tar.gz
URL: http://sme.firewall-services.com
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
BuildArchitectures: noarch
BuildRequires: e-smith-devtools
Requires: e-smith-release >= 7.0 
Requires: openssl 
Requires: coova-chilli >= 1.0.13
Requires: e-smith-radiusd >= 1.0.0-18
Requires: perl(NetAddr::IP)
Requires: smeserver-remoteuseraccess

Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
Patch2: smeserver-coova-chilli-0.2-guest_access.patch
Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch
Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch
Patch5: smeserver-coova-chilli-0.2-guest_access2.patch
Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
Patch8: smeserver-coova-chilli-0.2-tundev.patch
Patch9: smeserver-coova-chilli-0.2-dhcp_range.patch
Patch10: smeserver-coova-chilli-0.2-localhost_nas.patch
Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch
Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch
Patch13: smeserver-coova-chilli-0.2-typo.patch
Patch14: smeserver-coova-chilli-0.2-allow_uamallowed.patch
Patch15: smeserver-coova-chilli-0.2-drop_privileges.patch
Patch16: smeserver-coova-chilli-0.2-use_sudo.patch
Patch17: smeserver-coova-chilli-0.2-templates2expand_in_createlinks.patch
Patch18: smeserver-coova-chilli-0.2-db_noc2c.patch
Patch19: smeserver-coova-chilli-0.2-remove_space.patch
Patch20: smeserver-coova-chilli-0.2-fixe_allow_uamallowed.patch
Patch21: smeserver-coova-chilli-0.2-fixe_squid_disabled.patch

%description
This package allow you to configure a third interface
(eth2). Just plug a WiFi AP on it, and you'll have
a secured captive portal. Users will be redirected
on a logon page and they'll have to enter credentials
(sme accounts) before the server allows them. By default, 
they'll only have web access if they are members of the group "chilli"
This contrib will only work in server&gateway mode 

%changelog
* Wed Apr 14 2010 Daniel B. <daniel@firewall-services.com> 0.2-16
- Fixe a bug in conup.sh and condown.sh

* Thu Jun 11 2009 Daniel B. <daniel@firewall-services.com> 0.2-15
- Fixe a bug in masq template for uamallowed entries

* Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
- Remove space in hotspot-config.pl template

* Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13
- Add noc2c key (allow to disable the option, but default to enabled)

* Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
- Create a new user coovachilli
- Add support of new options uid and gid to drop privileges
- Enabled noc2c (prevent client to client communication)
- Use sudo to call conup/condown script (as chilli runs under un
  unprivileged account now)
- Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
- move templates2expand in creatlinks script

* Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
- Automatically allow uamallowed entries in the firewall (no need to 
  explicitly allow it agin in AllowOutgoing)

* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
- Small typo correction

* Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
- Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
  (thanks John K Pruder)
- fix a typo in squid template

* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
- Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)

* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
- Fix tundev template [SME: 5054]

* Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
- Remove warning in httpd.conf file (httpd -t)

* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
- Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]

* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
- Requires perl(NetAddr::IP)

* Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
- Chilli IP computed with NetAddr::IP
- Radius timeout set to 3 sec
- syntax error in radius users template fixed (for guest access)

* Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
- Bug fix for guest access

* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
- uplink and downlink for guest account are configurable via db keys

* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
- Login page is a CGI, with a server-manager login page look
- Guest Access can be enabled with guestAccess key (enabled/disabled)
- merge patchs in main package

* Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
- Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
- Add WebRequests key (use of squid or direct connexions, default to direct)
- disable radconf in /etc/chilli/config
- possible to disable https (enabled by default in AllowedOutgoing)
- add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
- add radiustimeout directive so authentication errors display the standard message quickly

* 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
- initialise default configuration db in the spec file

* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
- Remove the reset of $OUT from the template

* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
- Add template to enable auth module unix (replace the template-custom)
- Copy images to /opt/chilli/template before removing .rpmnew directory
- Correct dependency (e-smith-radiusd not esmith-radiusd)

* Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
- Split requirements to one per line
- Removed .rpmnew directory from package
- Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18

* Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
- [0.1-2]
- Most firewall customizations (for incomming and forwarded traffic from
  chilli network only) can be set through db commands (Patch3)
- Outgoing DNS is allowed only for the two DNS servers configured
- Clean spec file, and put php files in /opt/chilli (Patch4)

* Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
- [0.1-1]
- security fixe: auth bypass with squid (patch1)
- masq template not expanded (patch2)

* Fri Apr 04 2008 Daniel Berteaud <daniel@firewall-services.com>
- [0.1]
- initiale release

%prep
%setup
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1

%build
/usr/bin/perl createlinks

%install
/bin/rm -rf $RPM_BUILD_ROOT
(cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
/bin/rm -f %{name}-%{version}-filelist
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
        --file /etc/chilli/conup.sh 'attr(755,root,root)' \
        --file /etc/chilli/condown.sh 'attr(750,root,root)' \
        --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
        --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
        --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
        --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
        --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
        --file /opt/chilli/css/sme.css 'config(noreplace)' \
        > %{name}-%{version}-filelist

%files -f %{name}-%{version}-filelist
%defattr(-,root,root)

%clean 
rm -rf $RPM_BUILD_ROOT

%pre
if ! /usr/bin/id coovachilli &>/dev/null; then
        /usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \
                %logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
fi


%preun

if [ $1 == 0 ]; then
        /sbin/e-smith/db configuration setprop chilli status disabled
        /etc/rc.d/init.d/chilli stop >& /dev/null || :
fi

1	vip-ire	1.30	# $Id: smeserver-coova-chilli.spec,v 1.29 2009/06/11 09:16:08 vip-ire Exp $
2	slords	1.7	# Authority: vip-ire
3			# Name: Daniel Berteaud
4
5	slords	1.1	Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server
6			%define name smeserver-coova-chilli
7			Name: %{name}
8	slords	1.15	%define version 0.2
9	vip-ire	1.30	%define release 16
10	slords	1.1	Version: %{version}
11	vip-ire	1.5	Release: %{release}%{?dist}
12	vip-ire	1.4	License: GPL
13	slords	1.1	Group: Networking/Remote access
14			Source: %{name}-%{version}.tar.gz
15			URL: http://sme.firewall-services.com
16			BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
17			BuildArchitectures: noarch
18	vip-ire	1.6	BuildRequires: e-smith-devtools
19	snetram	1.8	Requires: e-smith-release >= 7.0
20			Requires: openssl
21	vip-ire	1.26	Requires: coova-chilli >= 1.0.13
22	vip-ire	1.10	Requires: e-smith-radiusd >= 1.0.0-18
23	vip-ire	1.18	Requires: perl(NetAddr::IP)
24	vip-ire	1.26	Requires: smeserver-remoteuseraccess
25	vip-ire	1.3
26	slords	1.15	Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
27			Patch2: smeserver-coova-chilli-0.2-guest_access.patch
28	vip-ire	1.17	Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch
29			Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch
30			Patch5: smeserver-coova-chilli-0.2-guest_access2.patch
31	vip-ire	1.18	Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
32	vip-ire	1.19	Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
33	vip-ire	1.22	Patch8: smeserver-coova-chilli-0.2-tundev.patch
34	vip-ire	1.23	Patch9: smeserver-coova-chilli-0.2-dhcp_range.patch
35	vip-ire	1.24	Patch10: smeserver-coova-chilli-0.2-localhost_nas.patch
36			Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch
37			Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch
38	vip-ire	1.25	Patch13: smeserver-coova-chilli-0.2-typo.patch
39	vip-ire	1.26	Patch14: smeserver-coova-chilli-0.2-allow_uamallowed.patch
40			Patch15: smeserver-coova-chilli-0.2-drop_privileges.patch
41			Patch16: smeserver-coova-chilli-0.2-use_sudo.patch
42			Patch17: smeserver-coova-chilli-0.2-templates2expand_in_createlinks.patch
43	vip-ire	1.27	Patch18: smeserver-coova-chilli-0.2-db_noc2c.patch
44	vip-ire	1.28	Patch19: smeserver-coova-chilli-0.2-remove_space.patch
45	vip-ire	1.29	Patch20: smeserver-coova-chilli-0.2-fixe_allow_uamallowed.patch
46	vip-ire	1.30	Patch21: smeserver-coova-chilli-0.2-fixe_squid_disabled.patch
47	slords	1.1
48			%description
49			This package allow you to configure a third interface
50			(eth2). Just plug a WiFi AP on it, and you'll have
51			a secured captive portal. Users will be redirected
52			on a logon page and they'll have to enter credentials
53			(sme accounts) before the server allows them. By default,
54	vip-ire	1.5	they'll only have web access if they are members of the group "chilli"
55			This contrib will only work in server&gateway mode
56	slords	1.1
57			%changelog
58	vip-ire	1.30	* Wed Apr 14 2010 Daniel B. <daniel@firewall-services.com> 0.2-16
59			- Fixe a bug in conup.sh and condown.sh
60
61	vip-ire	1.29	* Thu Jun 11 2009 Daniel B. <daniel@firewall-services.com> 0.2-15
62			- Fixe a bug in masq template for uamallowed entries
63
64	vip-ire	1.28	* Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
65			- Remove space in hotspot-config.pl template
66
67	vip-ire	1.27	* Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13
68			- Add noc2c key (allow to disable the option, but default to enabled)
69
70	vip-ire	1.26	* Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
71			- Create a new user coovachilli
72			- Add support of new options uid and gid to drop privileges
73			- Enabled noc2c (prevent client to client communication)
74			- Use sudo to call conup/condown script (as chilli runs under un
75			unprivileged account now)
76			- Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
77			- move templates2expand in creatlinks script
78
79			* Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
80			- Automatically allow uamallowed entries in the firewall (no need to
81			explicitly allow it agin in AllowOutgoing)
82
83	vip-ire	1.25	* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
84			- Small typo correction
85
86	vip-ire	1.24	* Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
87			- Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
88			(thanks John K Pruder)
89			- fix a typo in squid template
90
91	vip-ire	1.23	* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
92	vip-ire	1.24	- Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
93	vip-ire	1.23
94	vip-ire	1.22	* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
95			- Fix tundev template [SME: 5054]
96
97	vip-ire	1.19	* Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
98			- Remove warning in httpd.conf file (httpd -t)
99
100	vip-ire	1.18	* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
101	vip-ire	1.22	- Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
102	vip-ire	1.18
103			* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
104			- Requires perl(NetAddr::IP)
105
106	vip-ire	1.17	* Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
107			- Chilli IP computed with NetAddr::IP
108			- Radius timeout set to 3 sec
109			- syntax error in radius users template fixed (for guest access)
110
111	slords	1.15	* Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
112	vip-ire	1.17	- Bug fix for guest access
113	slords	1.15
114			* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
115			- uplink and downlink for guest account are configurable via db keys
116
117			* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
118			- Login page is a CGI, with a server-manager login page look
119	vip-ire	1.22	- Guest Access can be enabled with guestAccess key (enabled/disabled)
120	slords	1.15	- merge patchs in main package
121
122	vip-ire	1.14	* Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
123			- Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
124			- Add WebRequests key (use of squid or direct connexions, default to direct)
125			- disable radconf in /etc/chilli/config
126			- possible to disable https (enabled by default in AllowedOutgoing)
127			- add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
128			- add radiustimeout directive so authentication errors display the standard message quickly
129
130	snetram	1.13	* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
131			- Reverted moving of default db entries to SPEC file since common practice is to store them in files
132
133			* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
134	vip-ire	1.12	- split uamallowed (one per line)
135			- Add dnsparanoia directive
136			- correct cmdsock directive
137			- initialise default configuration db in the spec file
138
139	snetram	1.11	* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
140			- Remove the reset of $OUT from the template
141
142	vip-ire	1.9	* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
143			- Add template to enable auth module unix (replace the template-custom)
144			- Copy images to /opt/chilli/template before removing .rpmnew directory
145	vip-ire	1.10	- Correct dependency (e-smith-radiusd not esmith-radiusd)
146	vip-ire	1.9
147	snetram	1.8	* Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
148			- Split requirements to one per line
149			- Removed .rpmnew directory from package
150	vip-ire	1.9	- Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18
151	snetram	1.8
152	vip-ire	1.3	* Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
153			- [0.1-2]
154	vip-ire	1.5	- Most firewall customizations (for incomming and forwarded traffic from
155	vip-ire	1.3	chilli network only) can be set through db commands (Patch3)
156			- Outgoing DNS is allowed only for the two DNS servers configured
157	vip-ire	1.5	- Clean spec file, and put php files in /opt/chilli (Patch4)
158	vip-ire	1.3
159	slords	1.1	* Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
160			- [0.1-1]
161			- security fixe: auth bypass with squid (patch1)
162			- masq template not expanded (patch2)
163
164			* Fri Apr 04 2008 Daniel Berteaud <daniel@firewall-services.com>
165			- [0.1]
166			- initiale release
167
168			%prep
169			%setup
170			%patch1 -p1
171			%patch2 -p1
172	vip-ire	1.17	%patch3 -p1
173			%patch4 -p1
174			%patch5 -p1
175	vip-ire	1.18	%patch6 -p1
176	vip-ire	1.19	%patch7 -p1
177	vip-ire	1.22	%patch8 -p1
178	vip-ire	1.23	%patch9 -p1
179	vip-ire	1.24	%patch10 -p1
180			%patch11 -p1
181			%patch12 -p1
182	vip-ire	1.25	%patch13 -p1
183	vip-ire	1.26	%patch14 -p1
184			%patch15 -p1
185			%patch16 -p1
186			%patch17 -p1
187	vip-ire	1.27	%patch18 -p1
188	vip-ire	1.28	%patch19 -p1
189	vip-ire	1.29	%patch20 -p1
190	vip-ire	1.30	%patch21 -p1
191	slords	1.15
192	slords	1.1	%build
193			/usr/bin/perl createlinks
194
195			%install
196			/bin/rm -rf $RPM_BUILD_ROOT
197			(cd root ; /usr/bin/find . -depth -print \| /bin/cpio -dump $RPM_BUILD_ROOT)
198			/bin/rm -f %{name}-%{version}-filelist
199			/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
200	vip-ire	1.26	--file /etc/chilli/conup.sh 'attr(755,root,root)' \
201			--file /etc/chilli/condown.sh 'attr(750,root,root)' \
202			--file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
203			--file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
204	slords	1.15	--file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
205			--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
206			--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
207			--file /opt/chilli/css/sme.css 'config(noreplace)' \
208	slords	1.1	> %{name}-%{version}-filelist
209
210			%files -f %{name}-%{version}-filelist
211			%defattr(-,root,root)
212
213			%clean
214			rm -rf $RPM_BUILD_ROOT
215
216	vip-ire	1.26	%pre
217			if ! /usr/bin/id coovachilli &>/dev/null; then
218			/usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null \|\| \
219			%logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
220			fi
221
222
223	slords	1.1	%preun
224	vip-ire	1.3
225	slords	1.1	if [ $1 == 0 ]; then
226			/sbin/e-smith/db configuration setprop chilli status disabled
227	slords	1.7	/etc/rc.d/init.d/chilli stop >& /dev/null \|\| :
228	slords	1.1	fi
229