Changeset 1949

Show
Ignore:
Timestamp:
09/27/07 05:27:44 (1 year ago)
Author:
anarcat
Message:

remove duplicate icons alias, move non-bureau alternc conf to alternc.conf so that the bureau can be safely disabled by commenting out the bureau include in alternc.conf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc/trunk/etc/alternc/apache.conf

    r1868 r1949  
    2121        LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc 
    2222        CustomLog /var/log/apache/access.log alternc 
    23  
    2423</VirtualHost> 
    2524 
     25<Directory /var/alternc> 
     26        AllowOverride AuthConfig FileInfo 
     27        Options Indexes Includes FollowSymLinks MultiViews 
     28        Order allow,deny 
     29        Allow from all 
     30        php_admin_flag safe_mode_gid on 
     31        php_admin_flag safe_mode on 
     32        php_admin_value disable_functions chmod,chown,chgrp,link,symlink 
     33        php_admin_value safe_mode_exec_dir /var/alternc/exec.usr 
     34        php_admin_value disable_functions chgrp,link,symlink 
     35 
     36        php_admin_flag enable_dl off 
     37        php_admin_value upload_tmp_dir /var/alternc/tmp 
     38        php_admin_value sendmail_path /usr/lib/alternc/sendmail 
     39</Directory> 
     40 
    2641Include /etc/alternc/bureau.conf 

  • alternc/trunk/etc/alternc/templates/alternc/bureau.conf

    r1811 r1949  
    11        alias /admin/sql        /usr/share/phpmyadmin 
    22        alias /webmail          /usr/share/squirrelmail 
    3         Alias /icons/ /usr/share/apache/icons/ 
    43#       ***ALTERNC_ALIASES*** 
    54 
    6 <Directory /var/alternc> 
    7         AllowOverride AuthConfig FileInfo 
    8         Options Indexes Includes FollowSymLinks MultiViews 
    9         Order allow,deny 
    10         Allow from all 
    11         php_admin_flag safe_mode_gid on 
    12         php_admin_flag safe_mode on 
    13         php_admin_value disable_functions chmod,chown,chgrp,link,symlink 
    14         php_admin_value safe_mode_exec_dir /var/alternc/exec.usr 
    15         php_admin_value disable_functions chgrp,link,symlink 
    16  
    17         php_admin_flag enable_dl off 
    18         php_admin_value upload_tmp_dir /var/alternc/tmp 
    19         php_admin_value sendmail_path /usr/lib/alternc/sendmail 
    20 </Directory> 
    215<Directory /var/alternc/bureau> 
    226        php_admin_flag safe_mode_gid off 
    …… 
    248        php_admin_flag register_globals on 
    259</Directory> 
     10 
    2611<Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%> 
    2712        php_admin_flag safe_mode_gid off