From a8b05e045ce679b84f3c3dcf688bc2cf11bc2304 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Sun, 26 Aug 2012 20:46:32 +0000
Subject: [PATCH] Squirrelmail is only (for now) a simple specific domaintype.
 NEED TESTING

---
 .gitattributes                                |  3 ---
 debian/alternc-squirrelmail.dirs              |  5 ----
 squirrelmail/Makefile                         |  5 ----
 squirrelmail/apache-panel.d/squirrelmail.conf | 22 ------------------
 squirrelmail/apache2.conf                     | 23 -------------------
 squirrelmail/redirect.php                     |  4 ----
 squirrelmail/squirrelmail-install             | 21 +----------------
 7 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 squirrelmail/apache-panel.d/squirrelmail.conf
 delete mode 100644 squirrelmail/apache2.conf
 delete mode 100644 squirrelmail/redirect.php

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 @@
-
-<Location /squirrel>
-	ProxyPass http://squirrelmail.local/squirrel
-	ProxyPassReverse http://squirrelmail.local/squirrel
-</Location>
-
-  Alias /squirrel /usr/share/squirrelmail
-
-  <Directory /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
-  </Directory>
-
-  Alias /javascript /usr/share/javascript/
-
-  <Directory "/usr/share/javascript/">
-        Options FollowSymLinks MultiViews
-        Order allow,deny
-        Allow from all
-  </Directory>
-
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 @@
-<VirtualHost *:80>
-  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
-
-  <Directory /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
-  </Directory>
-
-  Alias /javascript /usr/share/javascript/
-
-  <Directory "/usr/share/javascript/">
-        Options FollowSymLinks MultiViews
-        Order allow,deny
-        Allow from all
-  </Directory>
-
-</VirtualHost>
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 @@
-<?php
-
-header("Location: /squirrel"); 
-
diff --git a/squirrelmail/squirrelmail-install b/squirrelmail/squirrelmail-install
index be6960b2..1f8fc65e 100644
--- a/squirrelmail/squirrelmail-install
+++ b/squirrelmail/squirrelmail-install
@@ -31,8 +31,7 @@ then
     
     . /usr/lib/alternc/functions.sh
     
-    echo "Setting squirrelmail as default webmail & installing domaintype"
-    mysql_query "INSERT IGNORE INTO variable SET name='webmail_redirect', value='squirrel', comment='Set it to the name of your preferred webmail, /webmail will point to it (squirrel, rc...)';"
+    echo "Setting squirrelmail domaintype"
     mysql_query "INSERT IGNORE INTO domaines_type (name ,description ,target ,entry ,compatibility ,enable ,only_dns ,need_dns ,advanced )VALUES ('squirrelmail','Squirrelmail Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', 'ALL', '0', '0', '0');"
     echo "    Done"
 
@@ -42,24 +41,6 @@ then
     mysql_query "UPDATE sub_domaines SET web_action='DELETE' WHERE type='webmail' AND web_action='OK';"
     echo "    Done"
     
-#    echo "Adding squirrelmail.local in /etc/hosts for webmail vhost"
-#    if ! grep -q "127.0.0.1.*squirrelmail.local" /etc/hosts
-#    then
-#	echo "127.0.0.1    squirrelmail.local" >>/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