Update config files.

[carnet-upgrade.git] / files / etc / squirrelmail / apache.conf.expect

diff --git a/files/etc/squirrelmail/apache.conf.expect b/files/etc/squirrelmail/apache.conf.expect
deleted file mode 100644 (file)
index 79df266..0000000
--- a/files/etc/squirrelmail/apache.conf.expect
+++ /dev/null
@@ -1,66 +0,0 @@
-# Begin update by CARNet package squirrelmail-cn -- DO NOT DELETE THIS LINE!
-# Force SSL for /webmail -> you can still use /squirrelmail
-Alias /webmail /usr/share/squirrelmail
-
-<IfModule mod_rewrite.c>
-  <IfModule mod_ssl.c>
-    <Location /webmail>
-      RewriteEngine on
-      RewriteCond %{HTTPS} !=on
-      RewriteRule . https://%{HTTP_HOST}%{REQUEST_URI}  [L]
-    </Location>
-  </IfModule>
-</IfModule>
-
-#
-# WARNING: This file is automatically included in each VirtualHost
-# entry you might have.  Do not enable the VirtualHost example provided
-# in this file, it WILL break your Apache configuration. Copy the
-# VirtualHost section to the standard webserver configuration file
-# instead.
-#
-# End update by CARNet package squirrelmail-cn -- DO NOT DELETE THIS LINE!
-Alias /squirrelmail /usr/share/squirrelmail
-
-<Directory /usr/share/squirrelmail>
-  Options Indexes FollowSymLinks
-  <IfModule mod_php4.c>
-    php_flag register_globals off
-  </IfModule>
-  <IfModule mod_php5.c>
-    php_flag register_globals off
-  </IfModule>
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-
-  # access to configtest is limited by default to prevent information leak
-  <Files configtest.php>
-    order deny,allow
-    deny from all
-    allow from 127.0.0.1
-  </Files>
-</Directory>
-
-# users will prefer a simple URL like http://webmail.example.com
-#<VirtualHost 1.2.3.4>
-#  DocumentRoot /usr/share/squirrelmail
-#  ServerName webmail.example.com
-#</VirtualHost>
-
-# redirect to https when available (thanks omen@descolada.dartmouth.edu)
-#
-#  Note: There are multiple ways to do this, and which one is suitable for
-#  your site's configuration depends. Consult the apache documentation if
-#  you're unsure, as this example might not work everywhere.
-#
-#<IfModule mod_rewrite.c>
-#  <IfModule mod_ssl.c>
-#    <Location /squirrelmail>
-#      RewriteEngine on
-#      RewriteCond %{HTTPS} !^on$ [NC]
-#      RewriteRule . https://%{HTTP_HOST}%{REQUEST_URI}  [L]
-#    </Location>
-#  </IfModule>
-#</IfModule>
-