Changeset 1542

Show
Ignore:
Timestamp:
04/26/06 23:23:50 (3 years ago)
Author:
anarcat
Message:

activate a configuration file for the bureau, common for both SSL and non-SSL configs, requested by pierre-gilles et
benji.

activate variable substitution for bureau.conf in alternc.install

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1017 r1542  
    33        SSLRequireSSL 
    44        DocumentRoot /var/alternc/bureau 
    5         alias /admin/sql        /usr/share/phpmyadmin 
    6         alias /webmail          /usr/share/squirrelmail 
    7         Alias /icons/ /usr/share/apache/icons/ 
    8 #       ***ALTERNC_ALIASES*** 
    9  
    10 <Directory /var/alternc> 
    11         php_admin_value disable_functions chmod,chown,chgrp,link,symlink 
    12         AllowOverride AuthConfig FileInfo 
    13         Options Indexes Includes FollowSymLinks MultiViews 
    14         Order allow,deny 
    15         Allow from all 
    16 </Directory> 
    17 <Directory /var/alternc/bureau> 
    18         php_admin_flag safe_mode_gid off 
    19         php_admin_flag safe_mode off 
    20 </Directory> 
    21 <Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%> 
    22         php_admin_flag safe_mode_gid off 
    23         php_admin_flag safe_mode off 
    24 </Directory> 
    25  
     5        Include /etc/alternc/bureau.conf 
    266</VirtualHost> 

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

    r1015 r1542  
    2727        CustomLog /var/log/apache/access.log full 
    2828</VirtualHost> 
     29 
     30Include /etc/alternc/bureau.conf 

  • alternc/trunk/install/alternc.install

    r1527 r1542  
    5252if [ -e /etc/default/saslauthd ]; then 
    5353    CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd" 
     54fi 
     55 
     56if [ -e /etc/alternc/bureau.conf ]; then 
     57    CONFIG_FILES="$CONFIG_FILES etc/alternc/bureau.conf" 
    5458fi 
    5559