[TWiki-Dev] [SVN] r1547 - twiki/trunk/tools/pkg/debian

[Sven D. <sdo...@nt...>]

Author: sdowideit
Date: 2004-06-26 09:18:39 -0700 (Sat, 26 Jun 2004)
New Revision: 1547

Modified:
   twiki/trunk/tools/pkg/debian/changelog
   twiki/trunk/tools/pkg/debian/control
   twiki/trunk/tools/pkg/debian/postinst
   twiki/trunk/tools/pkg/debian/postrm
Log:
remove wwwconfig altogether.


Modified: twiki/trunk/tools/pkg/debian/changelog
===================================================================
--- twiki/trunk/tools/pkg/debian/changelog	2004-06-26 13:58:02 UTC (rev 1546)
+++ twiki/trunk/tools/pkg/debian/changelog	2004-06-26 16:18:39 UTC (rev 1547)
@@ -8,7 +8,7 @@
     - (Closes: #255782)
   * made TWikiRegistrationPub the default to match .htaccess default
     - (Closes: #221514)
-  * use modules-config instead of apacheconfig (Closes: 251340)
+  * remove use of wwwconfig (Closes: 251340)
 
  -- Sven Dowideit <sv...@oz...>  Sun, 27 Jun 2004 00:00:01 -1000
 

Modified: twiki/trunk/tools/pkg/debian/control
===================================================================
--- twiki/trunk/tools/pkg/debian/control	2004-06-26 13:58:02 UTC (rev 1546)
+++ twiki/trunk/tools/pkg/debian/control	2004-06-26 16:18:39 UTC (rev 1547)
@@ -7,7 +7,7 @@
 
 Package: twiki
 Architecture: all
-Depends: ${perl:Depends}, libnet-perl, libmime-base64-perl, libdigest-sha1-perl, rcs (>= 5.7), apache | apache-perl | apache-ssl | apache2, debconf (>=  0.5), wwwconfig-common (>= 0.0.17), libalgorithm-diff-perl
+Depends: ${perl:Depends}, libnet-perl, libmime-base64-perl, libdigest-sha1-perl, rcs (>= 5.7), apache-common | apache2-common, debconf (>=  0.5), libalgorithm-diff-perl
 Description: A Web Based Collaboration Platform
  TWiki is a modern CGI-based implementation of the Wiki collaboration platform
  originally developed for OOP/Patterns collaboration.  In addition to the 

Modified: twiki/trunk/tools/pkg/debian/postinst
===================================================================
--- twiki/trunk/tools/pkg/debian/postinst	2004-06-26 13:58:02 UTC (rev 1546)
+++ twiki/trunk/tools/pkg/debian/postinst	2004-06-26 16:18:39 UTC (rev 1547)
@@ -78,37 +78,16 @@
 
 	servers="apache apache-perl apache-ssl apache2"
 	for server in $servers; do 
-	    . /usr/share/wwwconfig-common/apache-run.get
-	    includefile=/etc/twiki/apache.conf
-	    . /usr/share/wwwconfig-common/apache-include_all.sh
-	    if [ "$status" = "uncomment" -o "$status" = "include" ] ; then
-		restart="$server $restart"
-	    fi
+		if [ -e /etc/$server/conf.d ]; then
+			includefile=/etc/twiki/apache.conf
+			ln -s $includefile /etc/$server/conf.d/twiki.conf 
+		fi
 	done
-# 	if egrep '^twikidat$' /etc/cgiwrap.allow 2>&1 >/dev/null ; then
-# 	    : # already there
-# 	else
-# 	    # eek! this is a conffile of cgiwrap, so don't do that?
-# 	    echo twikidat >> /etc/cgiwrap.allow
-# 	fi
 
-
-        if test -s /etc/apache/httpd.conf
-        then
-           if grep '^LoadModule.*mod_actions\.so' /etc/apache/httpd.conf 2>&1 >/dev/null
-           then
-	       # we're ok
-	       :
-	   else
-	       echo "twiki needs mod_action loaded,  doing DSO scan..."
-	       if [ -x /usr/sbin/modules-config ]; then
-#grumble - why do i need to know which apache is loaded?
-		   /usr/sbin/modules-config apache enable modaction
-		   echo "Restart apache yourself for now..."
-	       fi
-	   fi
+	if [ -e /usr/sbin/apachectl ]; then
+		/usr/sbin/apachectl restart
 	fi
-	. /usr/share/wwwconfig-common/restart.sh
+
 	# create initial htpasswd, if needed
 	if [ -e /var/lib/twiki/data ]; then	
 		#for now prefer apache 1 config, I don't know how to detect which one is prefered

Modified: twiki/trunk/tools/pkg/debian/postrm
===================================================================
--- twiki/trunk/tools/pkg/debian/postrm	2004-06-26 13:58:02 UTC (rev 1546)
+++ twiki/trunk/tools/pkg/debian/postrm	2004-06-26 16:18:39 UTC (rev 1547)
@@ -23,11 +23,15 @@
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 
-	if [ -e /usr/share/wwwconfig-common/apache-include-postrm.sh ]; then
-		servers="apache apache-ssl"
-		includefile=/etc/twiki/apache.conf
-		. /usr/share/wwwconfig-common/apache-include-postrm.sh
-		. /usr/share/wwwconfig-common/restart.sh
+	servers="apache apache-perl apache-ssl apache2"
+	for server in $servers; do 
+		if [ -e /etc/$server/conf.d/twiki.conf ]; then
+			rm /etc/$server/conf.d/twiki.conf 
+		fi
+	done
+
+	if [ -e /usr/sbin/apachectl ]; then
+		/usr/sbin/apachectl restart
 	fi
         ;;