/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-localhost_nas.patch
ViewVC logotype

Contents of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-localhost_nas.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Wed Mar 11 08:58:33 2009 UTC (15 years, 8 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-coova-chilli-0_2-14_el4_sme, smeserver-coova-chilli-0_2-17_el4_sme, smeserver-coova-chilli-0_2-10_el4_sme, smeserver-coova-chilli-0_2-16_el4_sme, smeserver-coova-chilli-0_2-13_el4_sme, smeserver-coova-chilli-0_2-19_el4_sme, smeserver-coova-chilli-0_2-12_el4_sme, smeserver-coova-chilli-0_2-18_el4_sme, smeserver-coova-chilli-0_2-9_el4_sme, smeserver-coova-chilli-0_2-20_el4_sme, smeserver-coova-chilli-0_2-15_el4_sme, HEAD 
Fix PPTP Conflict
1 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/etc/e-smith/db/configuration/migrate/60Chilli mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/db/configuration/migrate/60Chilli
2 --- smeserver-coova-chilli-0.2/root/etc/e-smith/db/configuration/migrate/60Chilli 2008-09-02 13:27:59.000000000 +0200
3 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/db/configuration/migrate/60Chilli 2009-03-10 23:33:44.000000000 +0100
4 @@ -1,13 +1,7 @@
5 {
6 my $chilliconf = $DB->get('chilli') || $DB->new_record('chilli', {type => 'service'});
7 - my $radiussecret = $chilliconf->prop('radiussecret') || '';
8 my $uamsecret = $chilliconf->prop('uamsecret') || '';
9
10 - if ($radiussecret eq ''){
11 - $pass=`/usr/bin/openssl rand -base64 20 | tr -c -d '[:graph:]'`;
12 - $chilliconf->set_prop('radiussecret',$pass);
13 - }
14 -
15 if ($uamsecret eq ''){
16 $pass=`/usr/bin/openssl rand -base64 60 | tr -c -d '[:graph:]'`;
17 $chilliconf->set_prop('uamsecret',$pass);
18 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/50radius mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/50radius
19 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/50radius 2009-03-10 23:34:14.000000000 +0100
20 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/50radius 2009-03-10 23:31:11.000000000 +0100
21 @@ -1,6 +1,12 @@
22 radiusserver1 127.0.0.1
23 radiusserver2 127.0.0.1
24 -radiussecret {$chilli{'radiussecret'} || 'azerty';}
25 +{
26 + use esmith::util;
27 + $pw = esmith::util::LdapPassword;
28 + $pw =~ s/^(.{31}).*$/$1/;
29 + "";
30 +}
31 +radiussecret {$pw || 'azerty';}
32 radiusauthport {$radiusd{'UDPPort'} || '1812';}
33 radiusacctport 1813
34 radiusnasid chilli
35 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/clients.conf/20chilli mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/clients.conf/20chilli
36 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/clients.conf/20chilli 2008-09-02 13:28:00.000000000 +0200
37 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/clients.conf/20chilli 1970-01-01 01:00:00.000000000 +0100
38 @@ -1,6 +0,0 @@
39 -client 127.0.0.1 \{
40 - secret = {$chilli{'radiussecret'} || 'azerty';}
41 - shortname = chilli
42 - nastype = other
43 -\}
44 -
45 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/radiusd.conf/25modules31unix mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/radiusd.conf/25modules31unix
46 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/radiusd.conf/25modules31unix 2008-09-02 13:28:00.000000000 +0200
47 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/radiusd.conf/25modules31unix 2009-03-10 23:32:02.000000000 +0100
48 @@ -1,8 +1,8 @@
49 -#Unix Auth for Chilli
50 - unix \{
51 + #Unix Auth for Chilli
52 + unix \{
53 cache = yes
54 cache_reload = 600
55 passwd = /etc/passwd
56 shadow = /etc/shadow
57 group = /etc/group
58 - \}
59 + \}
60 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/users/40chilli mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/users/40chilli
61 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/users/40chilli 2009-03-10 23:34:14.000000000 +0100
62 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/users/40chilli 2009-03-10 23:33:02.000000000 +0100
63 @@ -8,7 +8,7 @@
64 $uplink = $uplink * 1000;
65 $OUT =<<"END";
66
67 -guest NAS-Identifier == "chilli", Auth-Type := Local, User-Password == 'guest'
68 +guest NAS-Identifier == "localhost", Auth-Type := Local, User-Password == 'guest'
69 WISPr-Bandwidth-Max-Down = $downlink, WISPr-Bandwidth-Max-Up = $uplink
70 END
71 }
72 @@ -16,10 +16,10 @@
73 if (($chilli{'status'} || 'disabled') eq 'enabled'){
74 $OUT .=<<END;
75
76 -DEFAULT Group == "chilli", NAS-Identifier == "chilli", Auth-Type := unix
77 +DEFAULT Group == "chilli", NAS-Identifier == "localhost", Auth-Type := unix
78 # WISPr-Bandwidth-Max-Down = 512000, WISPr-Bandwidth-Max-Up = 128000
79
80 -DEFAULT Group != "chilli", NAS-Identifier == "chilli", Auth-Type := Reject
81 +DEFAULT Group != "chilli", NAS-Identifier == "localhost", Auth-Type := Reject
82 Reply-Message = "Your are not member of the allowed group"
83
84 END
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed