diff --git a/.gitattributes b/.gitattributes index bd560fe1..8b34758e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -334,6 +334,7 @@ debian/rules -text debian/templates -text etc/alternc/apache-ssl.conf -text etc/alternc/apache.conf -text +etc/alternc/bureau.conf -text etc/alternc/menulist.txt -text etc/alternc/phpmyadmin.inc.php -text etc/alternc/templates/apache-ssl/httpd.conf -text diff --git a/etc/alternc/apache-ssl.conf b/etc/alternc/apache-ssl.conf index 03e006e2..c6ad8f71 100644 --- a/etc/alternc/apache-ssl.conf +++ b/etc/alternc/apache-ssl.conf @@ -2,25 +2,5 @@ SSLEnable SSLRequireSSL DocumentRoot /var/alternc/bureau - alias /admin/sql /usr/share/phpmyadmin - alias /webmail /usr/share/squirrelmail - Alias /icons/ /usr/share/apache/icons/ -# ***ALTERNC_ALIASES*** - - - php_admin_value disable_functions chmod,chown,chgrp,link,symlink - AllowOverride AuthConfig FileInfo - Options Indexes Includes FollowSymLinks MultiViews - Order allow,deny - Allow from all - - - php_admin_flag safe_mode_gid off - php_admin_flag safe_mode off - - - php_admin_flag safe_mode_gid off - php_admin_flag safe_mode off - - + Include /etc/alternc/bureau.conf diff --git a/etc/alternc/apache.conf b/etc/alternc/apache.conf index ec5a5149..49e0aecd 100644 --- a/etc/alternc/apache.conf +++ b/etc/alternc/apache.conf @@ -26,3 +26,5 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ CustomLog /var/log/apache/access.log full + +Include /etc/alternc/bureau.conf diff --git a/etc/alternc/bureau.conf b/etc/alternc/bureau.conf new file mode 100644 index 00000000..873c633f --- /dev/null +++ b/etc/alternc/bureau.conf @@ -0,0 +1,20 @@ + alias /admin/sql /usr/share/phpmyadmin + alias /webmail /usr/share/squirrelmail + Alias /icons/ /usr/share/apache/icons/ +# ***ALTERNC_ALIASES*** + + + php_admin_value disable_functions chmod,chown,chgrp,link,symlink + AllowOverride AuthConfig FileInfo + Options Indexes Includes FollowSymLinks MultiViews + Order allow,deny + Allow from all + + + php_admin_flag safe_mode_gid off + php_admin_flag safe_mode off + + + php_admin_flag safe_mode_gid off + php_admin_flag safe_mode off + diff --git a/install/alternc.install b/install/alternc.install index 68b45d8c..e1243bd8 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -53,6 +53,10 @@ if [ -e /etc/default/saslauthd ]; then CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd" fi +if [ -e /etc/alternc/bureau.conf ]; then + CONFIG_FILES="$CONFIG_FILES etc/alternc/bureau.conf" +fi + INSTALLED_CONFIG_TAR="/var/backups/alternc/etc-installed.tar.gz" #######################################################################