From 843f1fb2462efed83c3fe02ca454afc49a07ab94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@anarcat.ath.cx>
Date: Thu, 27 Sep 2007 03:27:44 +0000
Subject: [PATCH] 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

---
 etc/alternc/apache.conf                   | 17 ++++++++++++++++-
 etc/alternc/templates/alternc/bureau.conf | 17 +----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/etc/alternc/apache.conf b/etc/alternc/apache.conf
index 328c3ba5..61b32111 100644
--- a/etc/alternc/apache.conf
+++ b/etc/alternc/apache.conf
@@ -20,7 +20,22 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
 
 	LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc
         CustomLog /var/log/apache/access.log alternc
-
 </VirtualHost>
 
+<Directory /var/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
+</Directory>
+
 Include /etc/alternc/bureau.conf
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index 0cea6251..d5987e3e 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -1,28 +1,13 @@
 	alias /admin/sql        /usr/share/phpmyadmin
 	alias /webmail          /usr/share/squirrelmail
-	Alias /icons/ /usr/share/apache/icons/
 #	***ALTERNC_ALIASES***
 
-<Directory /var/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
-</Directory>
 <Directory /var/alternc/bureau>
 	php_admin_flag safe_mode_gid off
 	php_admin_flag safe_mode off
         php_admin_flag register_globals on
 </Directory>
+
 <Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%>
         php_admin_flag safe_mode_gid off
         php_admin_flag safe_mode off