1 |
|
# $Id: smeserver-coova-chilli.spec,v 1.16 2008/09/04 13:58:06 slords Exp $ |
2 |
|
# Authority: vip-ire |
3 |
|
# Name: Daniel Berteaud |
4 |
|
|
5 |
Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server |
Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server |
6 |
%define name smeserver-coova-chilli |
%define name smeserver-coova-chilli |
7 |
Name: %{name} |
Name: %{name} |
8 |
%define version 0.1 |
%define version 0.2 |
9 |
%define release 2.el4.sme |
%define release 3 |
10 |
Version: %{version} |
Version: %{version} |
11 |
Release: %{release} |
Release: %{release}%{?dist} |
12 |
License: GPL |
License: GPL |
13 |
Group: Networking/Remote access |
Group: Networking/Remote access |
14 |
Source: %{name}-%{version}.tar.gz |
Source: %{name}-%{version}.tar.gz |
15 |
URL: http://sme.firewall-services.com |
URL: http://sme.firewall-services.com |
|
Packager: Daniel Berteaud <daniel@firewall-services.com> |
|
16 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
17 |
BuildArchitectures: noarch |
BuildArchitectures: noarch |
18 |
Requires: e-smith-release >= 7.0 openssl coova-chilli |
BuildRequires: e-smith-devtools |
19 |
|
Requires: e-smith-release >= 7.0 |
20 |
Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch |
Requires: openssl |
21 |
Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch |
Requires: coova-chilli |
22 |
Patch3: smeserver-coova-chilli-0.1-firewall2db.patch |
Requires: e-smith-radiusd >= 1.0.0-18 |
23 |
Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch |
|
24 |
|
Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch |
25 |
|
Patch2: smeserver-coova-chilli-0.2-guest_access.patch |
26 |
|
Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch |
27 |
|
Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch |
28 |
|
Patch5: smeserver-coova-chilli-0.2-guest_access2.patch |
29 |
|
|
30 |
%description |
%description |
31 |
This package allow you to configure a third interface |
This package allow you to configure a third interface |
33 |
a secured captive portal. Users will be redirected |
a secured captive portal. Users will be redirected |
34 |
on a logon page and they'll have to enter credentials |
on a logon page and they'll have to enter credentials |
35 |
(sme accounts) before the server allows them. By default, |
(sme accounts) before the server allows them. By default, |
36 |
they'll only have web access if they are members of the group "chilli" |
they'll only have web access if they are members of the group "chilli" |
37 |
|
This contrib will only work in server&gateway mode |
38 |
|
|
39 |
%changelog |
%changelog |
40 |
|
* Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3 |
41 |
|
- Chilli IP computed with NetAddr::IP |
42 |
|
- Radius timeout set to 3 sec |
43 |
|
- syntax error in radius users template fixed (for guest access) |
44 |
|
|
45 |
|
* Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2 |
46 |
|
- Bug fix for guest access |
47 |
|
|
48 |
|
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1 |
49 |
|
- uplink and downlink for guest account are configurable via db keys |
50 |
|
|
51 |
|
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0 |
52 |
|
- Login page is a CGI, with a server-manager login page look |
53 |
|
- Guest Access can be enabled with guestAccess key (enabled/isabled) |
54 |
|
- merge patchs in main package |
55 |
|
|
56 |
|
* Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8 |
57 |
|
- Fix uamallowed not working (since bypass_auth_with_squid_fix patch) |
58 |
|
- Add WebRequests key (use of squid or direct connexions, default to direct) |
59 |
|
- disable radconf in /etc/chilli/config |
60 |
|
- possible to disable https (enabled by default in AllowedOutgoing) |
61 |
|
- add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly |
62 |
|
- add radiustimeout directive so authentication errors display the standard message quickly |
63 |
|
|
64 |
|
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7 |
65 |
|
- Reverted moving of default db entries to SPEC file since common practice is to store them in files |
66 |
|
|
67 |
|
* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6 |
68 |
|
- split uamallowed (one per line) |
69 |
|
- Add dnsparanoia directive |
70 |
|
- correct cmdsock directive |
71 |
|
- initialise default configuration db in the spec file |
72 |
|
|
73 |
|
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5 |
74 |
|
- Remove the reset of $OUT from the template |
75 |
|
|
76 |
|
* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4 |
77 |
|
- Add template to enable auth module unix (replace the template-custom) |
78 |
|
- Copy images to /opt/chilli/template before removing .rpmnew directory |
79 |
|
- Correct dependency (e-smith-radiusd not esmith-radiusd) |
80 |
|
|
81 |
|
* Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3 |
82 |
|
- Split requirements to one per line |
83 |
|
- Removed .rpmnew directory from package |
84 |
|
- Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18 |
85 |
|
|
86 |
* Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com> |
* Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com> |
87 |
- [0.1-2] |
- [0.1-2] |
88 |
- Most firewall customizations (for incomming and forwarded traffic from |
- Most firewall customizations (for incomming and forwarded traffic from |
89 |
chilli network only) can be set through db commands (Patch3) |
chilli network only) can be set through db commands (Patch3) |
90 |
- Outgoing DNS is allowed only for the two DNS servers configured |
- Outgoing DNS is allowed only for the two DNS servers configured |
91 |
- Clean spec file, adn put php files in /opt/chilli (Patch4) |
- Clean spec file, and put php files in /opt/chilli (Patch4) |
|
|
|
92 |
|
|
93 |
* Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com> |
* Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com> |
94 |
- [0.1-1] |
- [0.1-1] |
105 |
%patch2 -p1 |
%patch2 -p1 |
106 |
%patch3 -p1 |
%patch3 -p1 |
107 |
%patch4 -p1 |
%patch4 -p1 |
108 |
|
%patch5 -p1 |
109 |
|
|
110 |
%build |
%build |
111 |
/usr/bin/perl createlinks |
/usr/bin/perl createlinks |
117 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
118 |
--file /etc/chilli/conup.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/conup.sh 'attr(0750,root,root)' \ |
119 |
--file /etc/chilli/condown.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/condown.sh 'attr(0750,root,root)' \ |
120 |
--file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \ |
--file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \ |
121 |
--file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
122 |
--file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
123 |
--file /opt/chilli/hotspotlogin.php 'config(noreplace)' \ |
--file /opt/chilli/css/sme.css 'config(noreplace)' \ |
|
--file /opt/chilli/lang/en.php 'config(noreplace)' \ |
|
|
--file /opt/chilli/lang/fr.php 'config(noreplace)' \ |
|
|
--file /opt/chilli/lang/main.php 'config(noreplace)' \ |
|
|
--file /opt/chilli/template/loggingin.php 'config(noreplace)' \ |
|
|
--file /opt/chilli/template/loginform-footer.php 'config(noreplace)' \ |
|
|
--file /opt/chilli/template/loginform-header.php 'config(noreplace)' \ |
|
124 |
> %{name}-%{version}-filelist |
> %{name}-%{version}-filelist |
125 |
|
|
126 |
%files -f %{name}-%{version}-filelist |
%files -f %{name}-%{version}-filelist |
129 |
%clean |
%clean |
130 |
rm -rf $RPM_BUILD_ROOT |
rm -rf $RPM_BUILD_ROOT |
131 |
|
|
|
%pre |
|
|
|
|
|
|
|
|
%post |
|
|
|
|
132 |
%preun |
%preun |
133 |
|
|
134 |
if [ $1 == 0 ]; then |
if [ $1 == 0 ]; then |
135 |
/sbin/e-smith/db configuration setprop chilli status disabled |
/sbin/e-smith/db configuration setprop chilli status disabled |
136 |
/etc/rc.d/init.d/chilli stop > /dev/null 2>&1 |
/etc/rc.d/init.d/chilli stop >& /dev/null || : |
|
true |
|
137 |
fi |
fi |
138 |
|
|
|
%postun |
|
|
|
|