1 |
# $Id: smeserver-coova-chilli.spec,v 1.3 2022/07/29 05:23:38 jpp 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 6 |
10 |
Version: %{version} |
11 |
Release: %{release}%{?dist} |
12 |
License: GPL |
13 |
Group: Networking/Remote access |
14 |
Source: %{name}-%{version}.tar.xz |
15 |
Patch0: smeserver-coova-chilli-0.3-MasqUpdate.patch |
16 |
Patch1: smeserver-coova-chilli-0.3-logout_screen.patch |
17 |
Patch2: smeserver-coova-chilli-0.3-dnsfix.patch |
18 |
Patch3: smeserver-coova-chilli-0.3-bz12041-24syntax.patch |
19 |
URL: https://contribs.org |
20 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
21 |
BuildArchitectures: noarch |
22 |
BuildRequires: e-smith-devtools |
23 |
Requires: e-smith-apache >= 2.6.0-19 |
24 |
Requires: e-smith-release >= 10.0 |
25 |
Requires: openssl |
26 |
Requires: coova-chilli >= 1.0.13 |
27 |
Requires: e-smith-radiusd >= 1.0.0-18 |
28 |
Requires: perl(NetAddr::IP) |
29 |
Requires: smeserver-remoteuseraccess |
30 |
|
31 |
%description |
32 |
This package allow you to configure a third interface |
33 |
(eth2). Just plug a WiFi AP on it, and you'll have |
34 |
a secured captive portal. Users will be redirected |
35 |
on a logon page and they'll have to enter credentials |
36 |
(sme accounts) before the server allows them. By default, |
37 |
they'll only have web access if they are members of the group "chilli" |
38 |
This contrib will only work in server&gateway mode |
39 |
|
40 |
%changelog |
41 |
* Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-6.sme |
42 |
- update access syntax for httpd 2.4 [SME: 12041] |
43 |
|
44 |
* Mon Dec 21 2020 Brian Read <brianr@bjsystems.co.uk> 0.3-5.sme |
45 |
- Initial Import in SME10 [SME: 11289] |
46 |
|
47 |
* Tue Jul 05 2016 Jean-Philipe Pialasse <tests@pialasse.com> 0.3-4.sme |
48 |
- fix old dns default are not available [SME: 9514] |
49 |
|
50 |
* Tue Jul 05 2016 Jean-Philipe Pialasse <tests@pialasse.com> 0.3-3.sme |
51 |
- fix format for logout screen [SME: 9514] |
52 |
- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, |
53 |
by assuming the date is correct and changing the weekday. |
54 |
Thu Sep 03 2008 --> Thu Aug 28 2008 or Wed Sep 03 2008 or Thu Sep 04 2008 or .... |
55 |
Sun Mar 07 2009 --> Sun Mar 01 2009 or Sat Mar 07 2009 or Sun Mar 08 2009 or .... |
56 |
Wed Mar 13 2009 --> Wed Mar 11 2009 or Fri Mar 13 2009 or Wed Mar 18 2009 or .... |
57 |
|
58 |
* Thu May 26 2016 Jean-Philipe Pialasse <tests@pialasse.com> 0.3-2.sme |
59 |
- fix iptables syntax exclamation mark misplaced [SME: 9514] |
60 |
- smeserver-coova-chilli-0.3-MasqUpdate.patch |
61 |
|
62 |
* Fri May 13 2016 Daniel Berteaud <daniel@firewall-services.com> 0.3-1 |
63 |
- Roll new stream for sme9 |
64 |
|
65 |
* Mon Mar 28 2011 Daniel B. <daniel@firewall-services.com> 0.2-20 |
66 |
- Fix uamhomepage setting |
67 |
|
68 |
* Wed Oct 20 2010 Daniel B. <daniel@firewall-services.com> 0.2-19 |
69 |
- Drop all the trafic not going through the external interface |
70 |
|
71 |
* Thu Jul 29 2010 Daniel B. <daniel@firewall-services.com> 0.2-18 |
72 |
- cleanup CGI login script |
73 |
- remove obsolete php templates |
74 |
- add macallowed DB key to bypass auth for some mac addresses |
75 |
- add uamhomepage DB key |
76 |
|
77 |
* Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 0.2-17 |
78 |
- Fixes sudo env (bug only in SME8) |
79 |
- Uses TCPPort squid key instead of TransparentPort so coova can |
80 |
work with dansguardian |
81 |
- insert NAT rule just before the ACCEPT (PREROUTING_FROM_CHILLI) |
82 |
- add transparent directive to squid (required for squid => 2.6) |
83 |
|
84 |
* Wed Apr 14 2010 Daniel B. <daniel@firewall-services.com> 0.2-16 |
85 |
- Fixe a bug in conup.sh and condown.sh |
86 |
|
87 |
* Thu Jun 11 2009 Daniel B. <daniel@firewall-services.com> 0.2-15 |
88 |
- Fixe a bug in masq template for uamallowed entries |
89 |
|
90 |
* Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14 |
91 |
- Remove space in hotspot-config.pl template |
92 |
|
93 |
* Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13 |
94 |
- Add noc2c key (allow to disable the option, but default to enabled) |
95 |
|
96 |
* Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12 |
97 |
- Create a new user coovachilli |
98 |
- Add support of new options uid and gid to drop privileges |
99 |
- Enabled noc2c (prevent client to client communication) |
100 |
- Use sudo to call conup/condown script (as chilli runs under un |
101 |
unprivileged account now) |
102 |
- Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates) |
103 |
- move templates2expand in creatlinks script |
104 |
|
105 |
* Fri Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11 |
106 |
Wed Mar 13 2009 --> Wed Mar 11 2009 or Fri Mar 13 2009 or Wed Mar 18 2009 or .... |
107 |
- Automatically allow uamallowed entries in the firewall (no need to |
108 |
explicitly allow it agin in AllowOutgoing) |
109 |
|
110 |
* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10 |
111 |
- Small typo correction |
112 |
|
113 |
* Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9 |
114 |
- Use allready defined localhost NAS to fixe PPTP problem [SME: 4996] |
115 |
(thanks John K Pruder) |
116 |
- fix a typo in squid template |
117 |
|
118 |
* Sat Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8 |
119 |
- Add dhcpstart and dhcpstop db parameters (thanks John K Pruder) |
120 |
|
121 |
* Sat Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7 |
122 |
- Fix tundev template [SME: 5054] |
123 |
|
124 |
* Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6 |
125 |
- Remove warning in httpd.conf file (httpd -t) |
126 |
|
127 |
* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5 |
128 |
- Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559] |
129 |
|
130 |
* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4 |
131 |
- Requires perl(NetAddr::IP) |
132 |
|
133 |
* Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3 |
134 |
- Chilli IP computed with NetAddr::IP |
135 |
- Radius timeout set to 3 sec |
136 |
- syntax error in radius users template fixed (for guest access) |
137 |
|
138 |
* Wed Sep 03 2008 Daniel B. <daniel@firewall-services.com> 0.2-2 |
139 |
Thu Sep 03 2008 --> Thu Aug 28 2008 or Wed Sep 03 2008 or Thu Sep 04 2008 or .... |
140 |
- Bug fix for guest access |
141 |
|
142 |
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1 |
143 |
- uplink and downlink for guest account are configurable via db keys |
144 |
|
145 |
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0 |
146 |
- Login page is a CGI, with a server-manager login page look |
147 |
- Guest Access can be enabled with guestAccess key (enabled/disabled) |
148 |
- merge patchs in main package |
149 |
|
150 |
* Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8 |
151 |
- Fix uamallowed not working (since bypass_auth_with_squid_fix patch) |
152 |
- Add WebRequests key (use of squid or direct connexions, default to direct) |
153 |
- disable radconf in /etc/chilli/config |
154 |
- possible to disable https (enabled by default in AllowedOutgoing) |
155 |
- add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly |
156 |
- add radiustimeout directive so authentication errors display the standard message quickly |
157 |
|
158 |
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7 |
159 |
- Reverted moving of default db entries to SPEC file since common practice is to store them in files |
160 |
|
161 |
* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6 |
162 |
- split uamallowed (one per line) |
163 |
- Add dnsparanoia directive |
164 |
- correct cmdsock directive |
165 |
- initialise default configuration db in the spec file |
166 |
|
167 |
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5 |
168 |
- Remove the reset of $OUT from the template |
169 |
|
170 |
* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4 |
171 |
- Add template to enable auth module unix (replace the template-custom) |
172 |
- Copy images to /opt/chilli/template before removing .rpmnew directory |
173 |
- Correct dependency (e-smith-radiusd not esmith-radiusd) |
174 |
|
175 |
* Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3 |
176 |
- Split requirements to one per line |
177 |
- Removed .rpmnew directory from package |
178 |
- Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18 |
179 |
|
180 |
* Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com> |
181 |
- [0.1-2] |
182 |
- Most firewall customizations (for incomming and forwarded traffic from |
183 |
chilli network only) can be set through db commands (Patch3) |
184 |
- Outgoing DNS is allowed only for the two DNS servers configured |
185 |
- Clean spec file, and put php files in /opt/chilli (Patch4) |
186 |
|
187 |
* Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com> |
188 |
- [0.1-1] |
189 |
- security fixe: auth bypass with squid (patch1) |
190 |
- masq template not expanded (patch2) |
191 |
|
192 |
* Fri Apr 04 2008 Daniel Berteaud <daniel@firewall-services.com> |
193 |
- [0.1] |
194 |
- initiale release |
195 |
|
196 |
%prep |
197 |
%setup |
198 |
%patch0 -p1 |
199 |
%patch1 -p1 |
200 |
%patch2 -p1 |
201 |
%patch3 -p1 |
202 |
|
203 |
%build |
204 |
/usr/bin/perl createlinks |
205 |
|
206 |
%install |
207 |
/bin/rm -rf $RPM_BUILD_ROOT |
208 |
(cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT) |
209 |
/bin/rm -f %{name}-%{version}-filelist |
210 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
211 |
--file /etc/chilli/conup.sh 'attr(755,root,root)' \ |
212 |
--file /etc/chilli/condown.sh 'attr(750,root,root)' \ |
213 |
--file /etc/chilli/call_conup.sh 'attr(755,root,root)' \ |
214 |
--file /etc/chilli/call_condown.sh 'attr(755,root,root)' \ |
215 |
--file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \ |
216 |
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
217 |
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
218 |
--file /opt/chilli/css/sme.css 'config(noreplace)' \ |
219 |
> %{name}-%{version}-filelist |
220 |
|
221 |
%files -f %{name}-%{version}-filelist |
222 |
%defattr(-,root,root) |
223 |
|
224 |
%clean |
225 |
rm -rf $RPM_BUILD_ROOT |
226 |
|
227 |
%pre |
228 |
if ! /usr/bin/id coovachilli &>/dev/null; then |
229 |
/usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \ |
230 |
%logmsg "Unexpected error adding user \"coovachilli\". Abort installation." |
231 |
fi |
232 |
|
233 |
|
234 |
%preun |
235 |
|
236 |
if [ $1 == 0 ]; then |
237 |
/sbin/e-smith/db configuration setprop chilli status disabled |
238 |
/etc/rc.d/init.d/chilli stop >& /dev/null || : |
239 |
fi |
240 |
|