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