diff --git a/.gitattributes b/.gitattributes index 496c1731..7a2fb81f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -277,6 +277,7 @@ debian/rules -text debian/templates -text etc/alternc/apache-ssl.conf -text etc/alternc/apache.conf -text +etc/alternc/apache2.conf -text etc/alternc/menulist.txt -text etc/alternc/phpmyadmin.inc.php -text etc/alternc/postfix.cf -text diff --git a/debian/alternc-slave.postinst b/debian/alternc-slave.postinst index 9c447d79..ac8cde74 100644 --- a/debian/alternc-slave.postinst +++ b/debian/alternc-slave.postinst @@ -185,7 +185,7 @@ EOF fi if [ -x /usr/sbin/apache2 ]; then if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then - ln -sf /etc/alternc/apache.conf \ + ln -sf /etc/alternc/apache2.conf \ /etc/apache2/conf.d/alternc.conf fi if [ ! -h /etc/apache2/conf.d/override_php.conf ] && [ -e /etc/apache2/conf.d/ ]; then diff --git a/debian/alternc.postinst b/debian/alternc.postinst index d63c6eb6..5ade0001 100644 --- a/debian/alternc.postinst +++ b/debian/alternc.postinst @@ -217,7 +217,7 @@ EOF fi if [ -x /usr/sbin/apache2 ]; then if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then - ln -sf /etc/alternc/apache.conf \ + ln -sf /etc/alternc/apache2.conf \ /etc/apache2/conf.d/alternc.conf fi if [ ! -h /etc/apache2/conf.d/override_php.conf ] && [ -e /etc/apache2/conf.d/ ]; then diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf new file mode 100644 index 00000000..a20a2e91 --- /dev/null +++ b/etc/alternc/apache2.conf @@ -0,0 +1,41 @@ +# This module is loaded in /etc/apache/modules, and enabled by apache-modconf +# LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so + +ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ + + + Options FollowSymLinks IncludesNOEXEC ExecCGI + AllowOverride None + Order allow,deny + Allow from all + AddHandler cgi-script .cgi + + + +# ***ALTERNC_ALIASES*** + Alias /icons/ /usr/share/apache/icons/ + + UseCanonicalName Off + VirtualDocumentRoot /var/alternc/dns/%-2.1/%0 + + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc + CustomLog /var/log/apache2/access.log alternc + + + + AllowOverride AuthConfig FileInfo + Options Indexes Includes FollowSymLinks MultiViews + Order allow,deny + Allow from all + php_admin_flag safe_mode_gid on + php_admin_flag safe_mode on + php_admin_value disable_functions chmod,chown,chgrp,link,symlink + php_admin_value safe_mode_exec_dir /var/alternc/exec.usr + php_admin_value disable_functions chgrp,link,symlink + + php_admin_flag enable_dl off + php_admin_value upload_tmp_dir /var/alternc/tmp + php_admin_value sendmail_path /usr/lib/alternc/sendmail + + +Include /etc/alternc/bureau.conf