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

# $Id: smeserver-coova-chilli.spec,v 1.25 2009/03/12 14:54:34 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 12
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

%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
* 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

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