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

.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

etc/alternc/apache-ssl.conf

@@ -2,25 +2,5 @@
 	SSLEnable
         SSLRequireSSL
 	DocumentRoot /var/alternc/bureau
-	alias /admin/sql        /usr/share/phpmyadmin
+	Include /etc/alternc/bureau.conf
-	alias /webmail          /usr/share/squirrelmail
-	Alias /icons/ /usr/share/apache/icons/
-#	***ALTERNC_ALIASES***
-
-<Directory /var/alternc>
-	php_admin_value disable_functions chmod,chown,chgrp,link,symlink
-	AllowOverride AuthConfig FileInfo
-	Options Indexes Includes FollowSymLinks MultiViews
-	Order allow,deny
-	Allow from all
-</Directory>
-<Directory /var/alternc/bureau>
-	php_admin_flag safe_mode_gid off
-	php_admin_flag safe_mode off
-</Directory>
-<Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%>
-        php_admin_flag safe_mode_gid off
-        php_admin_flag safe_mode off
-</Directory>
-
 </VirtualHost>

etc/alternc/apache.conf

@@ -26,3 +26,5 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
 
         CustomLog /var/log/apache/access.log full
 </VirtualHost>
+
+Include /etc/alternc/bureau.conf

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***
+
+<Directory /var/alternc>
+	php_admin_value disable_functions chmod,chown,chgrp,link,symlink
+	AllowOverride AuthConfig FileInfo
+	Options Indexes Includes FollowSymLinks MultiViews
+	Order allow,deny
+	Allow from all
+</Directory>
+<Directory /var/alternc/bureau>
+	php_admin_flag safe_mode_gid off
+	php_admin_flag safe_mode off
+</Directory>
+<Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%>
+        php_admin_flag safe_mode_gid off
+        php_admin_flag safe_mode off
+</Directory>

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"
 
 #######################################################################