1 |
vip-ire |
1.1 |
# $Id: smeserver-coova-chilli.spec,v 1.34 2011/03/28 06:57:35 vip-ire Exp $ |
2 |
|
|
# Authority: vip-ire |
3 |
|
|
# Name: Daniel Berteaud |
4 |
|
|
|
5 |
|
|
Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server |
6 |
|
|
%define name smeserver-coova-chilli |
7 |
|
|
Name: %{name} |
8 |
|
|
%define version 0.3 |
9 |
|
|
%define release 1 |
10 |
|
|
Version: %{version} |
11 |
|
|
Release: %{release}%{?dist} |
12 |
|
|
License: GPL |
13 |
|
|
Group: Networking/Remote access |
14 |
|
|
Source: %{name}-%{version}.tar.xz |
15 |
|
|
URL: https://contribs.org |
16 |
|
|
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
17 |
|
|
BuildArchitectures: noarch |
18 |
|
|
BuildRequires: e-smith-devtools |
19 |
|
|
Requires: e-smith-release >= 7.0 |
20 |
|
|
Requires: openssl |
21 |
|
|
Requires: coova-chilli >= 1.0.13 |
22 |
|
|
Requires: e-smith-radiusd >= 1.0.0-18 |
23 |
|
|
Requires: perl(NetAddr::IP) |
24 |
|
|
Requires: smeserver-remoteuseraccess |
25 |
|
|
|
26 |
|
|
%description |
27 |
|
|
This package allow you to configure a third interface |
28 |
|
|
(eth2). Just plug a WiFi AP on it, and you'll have |
29 |
|
|
a secured captive portal. Users will be redirected |
30 |
|
|
on a logon page and they'll have to enter credentials |
31 |
|
|
(sme accounts) before the server allows them. By default, |
32 |
|
|
they'll only have web access if they are members of the group "chilli" |
33 |
|
|
This contrib will only work in server&gateway mode |
34 |
|
|
|
35 |
|
|
%changelog |
36 |
|
|
* Fri May 13 2016 Daniel Berteaud <daniel@firewall-services.com> 0.3-1 |
37 |
|
|
- Roll new stream for sme9 |
38 |
|
|
|
39 |
|
|
* Mon Mar 28 2011 Daniel B. <daniel@firewall-services.com> 0.2-20 |
40 |
|
|
- Fix uamhomepage setting |
41 |
|
|
|
42 |
|
|
* Wed Oct 20 2010 Daniel B. <daniel@firewall-services.com> 0.2-19 |
43 |
|
|
- Drop all the trafic not going through the external interface |
44 |
|
|
|
45 |
|
|
* Thu Jul 29 2010 Daniel B. <daniel@firewall-services.com> 0.2-18 |
46 |
|
|
- cleanup CGI login script |
47 |
|
|
- remove obsolete php templates |
48 |
|
|
- add macallowed DB key to bypass auth for some mac addresses |
49 |
|
|
- add uamhomepage DB key |
50 |
|
|
|
51 |
|
|
* Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 0.2-17 |
52 |
|
|
- Fixes sudo env (bug only in SME8) |
53 |
|
|
- Uses TCPPort squid key instead of TransparentPort so coova can |
54 |
|
|
work with dansguardian |
55 |
|
|
- insert NAT rule just before the ACCEPT (PREROUTING_FROM_CHILLI) |
56 |
|
|
- add transparent directive to squid (required for squid => 2.6) |
57 |
|
|
|
58 |
|
|
* 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 |
|
|
* 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 |
|
|
* Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14 |
65 |
|
|
- Remove space in hotspot-config.pl template |
66 |
|
|
|
67 |
|
|
* 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 |
|
|
* 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 |
|
|
* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10 |
84 |
|
|
- Small typo correction |
85 |
|
|
|
86 |
|
|
* 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 |
|
|
* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8 |
92 |
|
|
- Add dhcpstart and dhcpstop db parameters (thanks John K Pruder) |
93 |
|
|
|
94 |
|
|
* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7 |
95 |
|
|
- Fix tundev template [SME: 5054] |
96 |
|
|
|
97 |
|
|
* Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6 |
98 |
|
|
- Remove warning in httpd.conf file (httpd -t) |
99 |
|
|
|
100 |
|
|
* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5 |
101 |
|
|
- Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559] |
102 |
|
|
|
103 |
|
|
* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4 |
104 |
|
|
- Requires perl(NetAddr::IP) |
105 |
|
|
|
106 |
|
|
* 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 |
|
|
* Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2 |
112 |
|
|
- Bug fix for guest access |
113 |
|
|
|
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 |
|
|
- Guest Access can be enabled with guestAccess key (enabled/disabled) |
120 |
|
|
- merge patchs in main package |
121 |
|
|
|
122 |
|
|
* 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 |
|
|
* 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 |
|
|
- split uamallowed (one per line) |
135 |
|
|
- Add dnsparanoia directive |
136 |
|
|
- correct cmdsock directive |
137 |
|
|
- initialise default configuration db in the spec file |
138 |
|
|
|
139 |
|
|
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5 |
140 |
|
|
- Remove the reset of $OUT from the template |
141 |
|
|
|
142 |
|
|
* 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 |
|
|
- Correct dependency (e-smith-radiusd not esmith-radiusd) |
146 |
|
|
|
147 |
|
|
* 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 |
|
|
- Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18 |
151 |
|
|
|
152 |
|
|
* Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com> |
153 |
|
|
- [0.1-2] |
154 |
|
|
- Most firewall customizations (for incomming and forwarded traffic from |
155 |
|
|
chilli network only) can be set through db commands (Patch3) |
156 |
|
|
- Outgoing DNS is allowed only for the two DNS servers configured |
157 |
|
|
- Clean spec file, and put php files in /opt/chilli (Patch4) |
158 |
|
|
|
159 |
|
|
* 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 |
|
|
|
171 |
|
|
%build |
172 |
|
|
/usr/bin/perl createlinks |
173 |
|
|
|
174 |
|
|
%install |
175 |
|
|
/bin/rm -rf $RPM_BUILD_ROOT |
176 |
|
|
(cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT) |
177 |
|
|
/bin/rm -f %{name}-%{version}-filelist |
178 |
|
|
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
179 |
|
|
--file /etc/chilli/conup.sh 'attr(755,root,root)' \ |
180 |
|
|
--file /etc/chilli/condown.sh 'attr(750,root,root)' \ |
181 |
|
|
--file /etc/chilli/call_conup.sh 'attr(755,root,root)' \ |
182 |
|
|
--file /etc/chilli/call_condown.sh 'attr(755,root,root)' \ |
183 |
|
|
--file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \ |
184 |
|
|
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
185 |
|
|
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
186 |
|
|
--file /opt/chilli/css/sme.css 'config(noreplace)' \ |
187 |
|
|
> %{name}-%{version}-filelist |
188 |
|
|
|
189 |
|
|
%files -f %{name}-%{version}-filelist |
190 |
|
|
%defattr(-,root,root) |
191 |
|
|
|
192 |
|
|
%clean |
193 |
|
|
rm -rf $RPM_BUILD_ROOT |
194 |
|
|
|
195 |
|
|
%pre |
196 |
|
|
if ! /usr/bin/id coovachilli &>/dev/null; then |
197 |
|
|
/usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \ |
198 |
|
|
%logmsg "Unexpected error adding user \"coovachilli\". Abort installation." |
199 |
|
|
fi |
200 |
|
|
|
201 |
|
|
|
202 |
|
|
%preun |
203 |
|
|
|
204 |
|
|
if [ $1 == 0 ]; then |
205 |
|
|
/sbin/e-smith/db configuration setprop chilli status disabled |
206 |
|
|
/etc/rc.d/init.d/chilli stop >& /dev/null || : |
207 |
|
|
fi |
208 |
|
|
|