From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Thu, 1 Jun 2006 07:06:30 +0000 (+0000)
Subject: simplify postinst script by removing the following actions:
X-Git-Url: http://git.polytechnique.org/?p=diogenes.git;a=commitdiff_plain;h=3dbf59c2130516878d81c44acc265d9e218ccdf7

simplify postinst script by removing the following actions:
 - enabling PHP support in the webserver
 - enabling MySQL support in PHP
---

diff --git a/debian/README.Debian b/debian/README.Debian
index 7e8fcd8..cd3827c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,16 @@
 Diogenes for Debian
 -------------------
 
+WEBSERVER CONFIGURATION
+
+  On a Debian system, the default webserver configuration should allow you to
+  run Diogenes. If you have made some configuration changes yourself, you
+  should check the following:
+  
+   - your webserver needs to have PHP support enabled
+   - PHP needs to have MySQL support enabled
+
+
 GETTING STARTED WITH DIOGENES
 
   Diogenes will be available at http://localhost/diogenes/ after installation.
diff --git a/debian/changelog b/debian/changelog
index 60d5068..0775670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diogenes (0.9.19-1) unstable; urgency=low
 
   * New upstream release.
+  * Do not try to enable PHP support in the webserver or MySQL support in PHP
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Wed, 31 May 2006 21:03:46 +0200
 
diff --git a/debian/diogenes.postinst b/debian/diogenes.postinst
index f0b5b83..49db604 100644
--- a/debian/diogenes.postinst
+++ b/debian/diogenes.postinst
@@ -128,29 +128,8 @@ webservers="$RET"
 for server in $webservers; do
     server=$(echo $server | sed 's/,$//')
     servers="$server $servers"
-    # Make sure our web server has PHP support
-    phpver=php4
-    phpini=/etc/$phpver/$server/php.ini
-    . /usr/share/wwwconfig-common/apache-php.sh
-    if [ "$status" = "uncomment" ] ; then
-      restart="$server $restart"
-    elif [ "$status" = "error" ] ; then
-      echo "Error while trying to enable $phpver support for '$server' : $error."
-    fi
-
-    # Make sure that PHP has MySQL support enabled
-    checkextensions=mysql
-    . /usr/share/wwwconfig-common/php-extensions.sh
-    
     includefile=/etc/diogenes/apache.conf
-    # For old versions of Diogenes, remove the include of ourapache.conf
-    if dpkg --compare-versions "$2" le-nl "0.9.9.3-6" ; then
-        . /usr/share/wwwconfig-common/apache-uninclude_all.sh
-        if [ "$status" = "uncomment" ] ; then
-            restart="$server $restart"
-	fi
-    fi
-    
+
     # If necessary, add a symlink to our apache.conf
     if [ -d /etc/$server/conf.d ] && [ ! -e /etc/$server/conf.d/diogenes ] ; then
         ln -s $includefile /etc/$server/conf.d/diogenes