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

# $Id: smeserver-coova-chilli.spec,v 1.27 2009/05/26 13:46:19 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 14
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

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

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