Changeset 11219

Show
Ignore:
Timestamp:
08/17/08 17:41:41 (5 months ago)
Author:
/C=ES/O=Warp Networks S.L./CN=juruen@…
Message:

Merging r11212 through r11218 from trunk into intrepid branches

Location:
branches/juruen
Files:
58 modified
2 copied

Legend:

Unmodified
Added
Removed

  • branches/juruen/intrepid-alpha4/client/ca/debian/copyright

    r6576 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/dhcp/debian/copyright

    r3032 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/dns/debian/copyright

    r3032 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/ebox/ChangeLog

    r11197 r11219  
    1414        + Disable keepalive in eBox apache 
    1515        + Do not run a startup script in eBox apache 
     16        + Set default purge time for logs stored in eBox db to 1 week 
    16170.11.103 
    1718        + Modify EBox::Types::HasMany to create directory based on its row  

  • branches/juruen/intrepid-alpha4/client/ebox/debian/copyright

    r3032 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/ebox/src/EBox/Logs/Model/ConfigureLogDataTable.pm

    r11150 r11219  
    136136        $self->addRow(domain => $domain,  
    137137                      enabled => $enabled,  
    138                       lifeTime => 0); 
     138                      lifeTime => 168); 
    139139    } 
    140140 

  • branches/juruen/intrepid-alpha4/client/firewall/debian/copyright

    r3671 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/ipsec/debian/copyright

    r3032 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/jabber/debian/copyright

    r4638 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/mail/debian/copyright

    r4284 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/mailfilter/debian/copyright

    r7082 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/network/debian/copyright

    r3670 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/ntp/debian/copyright

    r3035 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/objects/debian/copyright

    r3669 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/openvpn/debian/copyright

    r11032 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/printers/debian/copyright

    r3674 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/samba/ChangeLog

    r11208 r11219  
    66        + Use eBox OID number in LDAP schemas 
    77        + Do not use shares that don't have permission for any user or group 
     8        + Remove deprecated printer admin configuration key in smb.conf.mas 
     9        + Enable dns proxy in smb.conf.mas 
    8100.11.103 
    911        + Bugfix. Add and use EBox::Samba::Types::Select to avoid  

  • branches/juruen/intrepid-alpha4/client/samba/debian/copyright

    r3673 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/samba/stubs/smb.conf.mas

    r10574 r11219  
    3535 printcap name = CUPS 
    3636 wins support = Yes 
     37 dns proxy = Yes 
    3738 ldap suffix = <% $ldap->{'dn'} %> 
    3839 ldap machine suffix = ou=Computers 
    … …  
    4344 map acl inherit = Yes 
    4445 printing = cups 
    45  printer admin = Administrator 
    4646 
    4747% if ($pdc) { 

  • branches/juruen/intrepid-alpha4/client/services/debian/copyright

    r7962 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/soap/debian/copyright

    r7216 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/software/debian/copyright

    r3043 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/squid/debian/copyright

    r3045 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/trafficshaping/debian/copyright

    r6288 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/usersandgroups/debian/copyright

    r3049 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/client/webserver/debian/copyright

    r8053 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/common/libebox/ChangeLog

    r11197 r11219  
    99        + Display 24 as default value in `IPNetwork` default setter 
    1010        + Comment out some debug 
     11        + Bugfix. Create redirection URLs using client headers and guessing checking 
     12          the protocol (HTTP or HTTPS) 
    11130.11.102 
    1214        + Added `override_user_modification` configuration parameter to 

  • branches/juruen/intrepid-alpha4/common/libebox/debian/copyright

    r3032 r11219  
    44It was downloaded from http://www.warp.es/ 
    55 
     6Files: * 
    67Upstream Author: Warp Networks S.L. <ebox@warp.es> 
    78 
    … …  
    2122        On Debian systems, the complete text of the GNU General Public 
    2223        License can be found in /usr/share/common-licenses/GPL file. 
     24 
     25 
     26Files: www/js/scriptaculous/slider.js 
     27Copyright: 
     28  (C) 2005-2008 Marty Haught <mghaught@gmail.com> 
     29  (C) 2005-2008 Thomas Fuchs <thomas@script.aculo.us> 
     30License: MIT 
     31 Permission is hereby granted, free of charge, to any person obtaining a copy of 
     32 this software and associated documentation files (the "Software"), to deal in 
     33 the Software without restriction, including without limitation the rights to 
     34 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
     35 of the Software, and to permit persons to whom the Software is furnished to do 
     36 so, subject to the following conditions: 
     37 . 
     38 The above copyright notice and this permission notice shall be included in all 
     39 copies or substantial portions of the Software. 
     40 . 
     41 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
     42 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
     43 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
     44 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
     45 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
     46 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
     47 SOFTWARE. 
     48 
     49Files: wwww/js/prototype.js 
     50Copyright: (C) 2005-2008 Sam Stephenson <sam@conio.net> 
     51License: MIT 
     52 Permission is hereby granted, free of charge, to any person obtaining a copy of 
     53 this software and associated documentation files (the "Software"), to deal in 
     54 the Software without restriction, including without limitation the rights to 
     55 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
     56 of the Software, and to permit persons to whom the Software is furnished to do 
     57 so, subject to the following conditions: 
     58 . 
     59 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
     60 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
     61 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
     62 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
     63 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
     64 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
     65 SOFTWARE. 
     66 
     67 
     68The Debian packaging is: 
     69 
     70    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     71    (C) 2008, Javier Uruen Val <javi@warp.es>  
     72     
     73and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-alpha4/common/libebox/src/EBox/CGI/Base.pm

    r10308 r11219  
    305305 
    306306        if ((defined($self->{redirect})) && (!defined($self->{error}))) { 
    307                 my $request = Apache2::RequestUtil->request(); 
    308                 my $headersIn = $request->headers_in();  
    309                 my $localAddr = $request->connection()->local_ip(); 
    310                 my $portStr = ''; 
    311                 # If the connection comes from a Proxy, redirects with the Proxy IP address 
    312                 if ( exists $headersIn->{Via} and exists $headersIn->{'X-Forwarded-Host'}) { 
    313                     $localAddr = $headersIn->{'X-Forwarded-Host'}; 
    314                 } else { 
    315                     my $apachePort = EBox::Global->getInstance(1)->modInstance('apache')->port(); 
    316                     if ( $apachePort != 443 ) { 
    317                         $portStr = ":$apachePort"; 
    318                     } 
    319                 } 
    320                 print($self->cgi()->redirect("https://${localAddr}${portStr}/ebox/" . $self->{redirect})); 
    321                 EBox::debug("redirect: " . $self->{redirect}); 
     307                my $request = Apache2::RequestUtil->request(); 
     308                my $headers = $request->headers_in(); 
     309                my $via = $headers->{'Via'};  
     310                my $host= $headers->{'Host'}; 
     311                my $fwhost = $headers->{'X-Forwaded-Host'}; 
     312                # If the connection comes from a Proxy,  
     313                # redirects with the Proxy IP address 
     314                if (defined($via) and defined($fwhost)) { 
     315                        $host = $fwhost;  
     316                } 
     317                my $protocol;  
     318                if ($request->->subprocess_env('https')) { 
     319                        $protocol = 'https'; 
     320                } else { 
     321                        $protocol = 'http'; 
     322                } 
     323                my $url = "$protocol://${host}/ebox/" . $self->{redirect}; 
     324                print($self->cgi()->redirect($url)); 
    322325                return; 
    323326        }  
    … …  
    325328         
    326329 
    327         try  {  
     330        try  { $url 
    328331          settextdomain('ebox'); 
    329332          $self->_print  

  • branches/juruen/intrepid-packages/client/ca/debian/copyright

    r6576 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 

  • branches/juruen/intrepid-packages/client/dhcp/debian/copyright

    r3032 r11219  
    2121        On Debian systems, the complete text of the GNU General Public 
    2222        License can be found in /usr/share/common-licenses/GPL file. 
     23 
     24The Debian packaging is: 
     25 
     26    (C) 2004, Isaac Clerencia <isaac@warp.es> 
     27    (C) 2008, Javier Uruen Val <javi@warp.es>  
     28     
     29and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.