diff --git a/.gitattributes b/.gitattributes
index f246ca99..44c28da6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -502,9 +502,6 @@ selenium/20120826-alternc-panel-testsuite.html -text
selenium/README -text
selenium/alternc.domain-local-mail-tld.html -text
squirrelmail/Makefile -text
-squirrelmail/apache-panel.d/squirrelmail.conf -text
-squirrelmail/apache2.conf -text
-squirrelmail/redirect.php -text
squirrelmail/squirrelmail-install -text
squirrelmail/templates/apache2/squirrelmail.conf -text
squirrelmail/templates/javascript-common/javascript-common.conf -text
diff --git a/debian/alternc-squirrelmail.dirs b/debian/alternc-squirrelmail.dirs
index b32c1518..92c5bf73 100644
--- a/debian/alternc-squirrelmail.dirs
+++ b/debian/alternc-squirrelmail.dirs
@@ -1,11 +1,6 @@
-etc/apache2/conf.d
etc/alternc
-etc/alternc/apache-panel.d
etc/alternc/templates/squirrelmail
etc/alternc/templates/apache2
etc/alternc/templates/javascript-common
-etc/cron.d
etc/squirrelmail
-usr/share/alternc/install
usr/lib/alternc/install.d
-usr/share/alternc-squirrelmail
\ No newline at end of file
diff --git a/squirrelmail/Makefile b/squirrelmail/Makefile
index 12098037..bb305d66 100644
--- a/squirrelmail/Makefile
+++ b/squirrelmail/Makefile
@@ -25,10 +25,5 @@ install:
install -m 644 templates/squirrelmail/* $(DESTDIR)/etc/alternc/templates/squirrelmail/
install -m 644 templates/javascript-common/* $(DESTDIR)/etc/alternc/templates/javascript-common/
install -m 750 squirrelmail-install $(DESTDIR)/usr/lib/alternc/install.d/
- install -m 644 apache-panel.d/squirrelmail.conf $(DESTDIR)/etc/alternc/apache-panel.d/
- # default webmail vhost: squirrelmail.local, will be proxified from http://panel/squirrel/
- install -m 644 apache2.conf $(DESTDIR)/etc/apache2/conf.d/alternc-squirrelmail.conf
# domaintype template:
install -m 644 templates/apache2/squirrelmail.conf $(DESTDIR)/etc/alternc/templates/apache2/squirrelmail.conf
- # empty folder for redirect to /squirrel location ...
- install -m 644 redirect.php $(DESTDIR)/usr/share/alternc-squirrelmail/index.php
diff --git a/squirrelmail/apache-panel.d/squirrelmail.conf b/squirrelmail/apache-panel.d/squirrelmail.conf
deleted file mode 100644
index 7b8a804c..00000000
--- a/squirrelmail/apache-panel.d/squirrelmail.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- ProxyPass http://squirrelmail.local/squirrel
- ProxyPassReverse http://squirrelmail.local/squirrel
-
-
- Alias /squirrel /usr/share/squirrelmail
-
-
- php_value open_basedir /usr/share/squirrelmail:/etc/squirrelmail/:/var/lib/squirrelmail/data/:/var/spool/squirrelmail/
- php_admin_flag safe_mode off
- Options Indexes FollowSymLinks
-
-
- Alias /javascript /usr/share/javascript/
-
-
- Options FollowSymLinks MultiViews
- Order allow,deny
- Allow from all
-
-
diff --git a/squirrelmail/apache2.conf b/squirrelmail/apache2.conf
deleted file mode 100644
index e760f114..00000000
--- a/squirrelmail/apache2.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-
- ServerName squirrelmail.local
- AssignUserId alternc-squirrelmail nogroup
-
- # Due to the PROXY TRICK, We need squirrel to be available BOTH at / AND /squirrel ...
- DocumentRoot /usr/share/squirrelmail/
- Alias /squirrel /usr/share/squirrelmail
-
-
- php_value open_basedir /usr/share/squirrelmail:/etc/squirrelmail/:/var/lib/squirrelmail/data/:/var/spool/squirrelmail/
- php_admin_flag safe_mode off
- Options Indexes FollowSymLinks
-
-
- Alias /javascript /usr/share/javascript/
-
-
- Options FollowSymLinks MultiViews
- Order allow,deny
- Allow from all
-
-
-
diff --git a/squirrelmail/redirect.php b/squirrelmail/redirect.php
deleted file mode 100644
index ab358c5d..00000000
--- a/squirrelmail/redirect.php
+++ /dev/null
@@ -1,4 +0,0 @@
->/etc/hosts
-# fi
fi
-#if [ "$1" = "apache2" ]
-#then
-# echo "Installing Apache Proxy module for Squirrelmail ..."
-# if ! [ -L /etc/apache2/mods-enabled/proxy.load ]
-# then
-# a2enmod proxy
-# fi
-# if ! [ -L /etc/apache2/mods-enabled/proxy_http.load ]
-# then
-# a2enmod proxy_http
-# fi
-# echo "Done"
-#fi