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 --- smeserver-coova-chilli-0.2/root/etc/e-smith/db/configuration/migrate/60Chilli 2008-09-02 13:27:59.000000000 +0200 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/db/configuration/migrate/60Chilli 2009-03-10 23:33:44.000000000 +0100 @@ -1,13 +1,7 @@ { my $chilliconf = $DB->get('chilli') || $DB->new_record('chilli', {type => 'service'}); - my $radiussecret = $chilliconf->prop('radiussecret') || ''; my $uamsecret = $chilliconf->prop('uamsecret') || ''; - if ($radiussecret eq ''){ - $pass=`/usr/bin/openssl rand -base64 20 | tr -c -d '[:graph:]'`; - $chilliconf->set_prop('radiussecret',$pass); - } - if ($uamsecret eq ''){ $pass=`/usr/bin/openssl rand -base64 60 | tr -c -d '[:graph:]'`; $chilliconf->set_prop('uamsecret',$pass); 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 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/50radius 2009-03-10 23:34:14.000000000 +0100 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/50radius 2009-03-10 23:31:11.000000000 +0100 @@ -1,6 +1,12 @@ radiusserver1 127.0.0.1 radiusserver2 127.0.0.1 -radiussecret {$chilli{'radiussecret'} || 'azerty';} +{ + use esmith::util; + $pw = esmith::util::LdapPassword; + $pw =~ s/^(.{31}).*$/$1/; + ""; +} +radiussecret {$pw || 'azerty';} radiusauthport {$radiusd{'UDPPort'} || '1812';} radiusacctport 1813 radiusnasid chilli 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 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/clients.conf/20chilli 2008-09-02 13:28:00.000000000 +0200 +++ 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 @@ -1,6 +0,0 @@ -client 127.0.0.1 \{ - secret = {$chilli{'radiussecret'} || 'azerty';} - shortname = chilli - nastype = other -\} - 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 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/radiusd.conf/25modules31unix 2008-09-02 13:28:00.000000000 +0200 +++ 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 @@ -1,8 +1,8 @@ -#Unix Auth for Chilli - unix \{ + #Unix Auth for Chilli + unix \{ cache = yes cache_reload = 600 passwd = /etc/passwd shadow = /etc/shadow group = /etc/group - \} + \} 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 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/users/40chilli 2009-03-10 23:34:14.000000000 +0100 +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/raddb/users/40chilli 2009-03-10 23:33:02.000000000 +0100 @@ -8,7 +8,7 @@ $uplink = $uplink * 1000; $OUT =<<"END"; -guest NAS-Identifier == "chilli", Auth-Type := Local, User-Password == 'guest' +guest NAS-Identifier == "localhost", Auth-Type := Local, User-Password == 'guest' WISPr-Bandwidth-Max-Down = $downlink, WISPr-Bandwidth-Max-Up = $uplink END } @@ -16,10 +16,10 @@ if (($chilli{'status'} || 'disabled') eq 'enabled'){ $OUT .=<