[csw-devel] SF.net SVN: gar:[4630] csw/mgar/pkg/mediawiki/trunk

[valholla at users.sourceforge.net]

Revision: 4630
          http://gar.svn.sourceforge.net/gar/?rev=4630&view=rev
Author:   valholla
Date:     2009-05-01 03:02:37 +0000 (Fri, 01 May 2009)

Log Message:
-----------
checkin

Modified Paths:
--------------
    csw/mgar/pkg/mediawiki/trunk/Makefile
    csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall
    csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove

Removed Paths:
-------------
    csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW

Modified: csw/mgar/pkg/mediawiki/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mediawiki/trunk/Makefile	2009-05-01 02:01:20 UTC (rev 4629)
+++ csw/mgar/pkg/mediawiki/trunk/Makefile	2009-05-01 03:02:37 UTC (rev 4630)
@@ -20,7 +20,7 @@
 SPKG_DESC_CSWmediawiki-math = LaTeX compatable Math plugin for MediaWiki
 
 REQUIRED_PKGS_CSWmediawiki  = CSWphp5
-REQUIRED_PKGS_CSWmediawiki-math  = CSWphp5 CSWmediawiki
+REQUIRED_PKGS_CSWmediawiki-math  = CSWphp5 CSWmediawiki CSWtetex
 
 PKGFILES_CSWmediawiki-math = .*/mediawiki/math.*
 

Modified: csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall
===================================================================
--- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall	2009-05-01 02:01:20 UTC (rev 4629)
+++ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall	2009-05-01 03:02:37 UTC (rev 4630)
@@ -8,35 +8,18 @@
 AP2_EXTRADIR=$AP2_CONFDIR/extra
 AP2_CONFIG=$AP2_CONFDIR/httpd.conf
 
-# Enable MediaWiki in httpd.conf
-FOUND=`grep "^Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}`
+AP2_SERVERNAME=`/bin/sed -ne 's/^[\s]*ServerName \(.*\)/\1/p' ${AP2_CONFIG}`
+AP2_DOCROOT=`/bin/sed -ne 's/^[\s]*DocumentRoot "\(.*\)"/\1/p' ${AP2_CONFIG}`
+/bin/ln -s /opt/csw/mediawiki ${AP2_DOCROOT}/wiki
 
-if [ -n "`grep "^Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}`" ]; then
-    echo "MediaWiki Already Enabled"
-elif [ -n "`grep "^#Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}`" ]; then
-    echo "Re-enabling existing config"
-    perl -i -pe 's|^#(Include etc/extra/httpd-mediawiki.conf)|$1|' ${AP2_CONFIG}
-else
-    echo "Adding Include for httpd-mediawiki.conf"
-    cat << _END_ >>${AP2_CONFIG}
-Include etc/extra/httpd-mediawiki.conf
-_END_
-fi
-
-file = ${AP2_EXTRADIR}/httpd-mediawiki.conf
-if [ ! -f ${file} ]; then
-    echo "Creating ${file} from ${file}.CSW"
-    cp ${file}.CSW ${file}
-else
-    echo "Preserving Existing ${file}"
-fi
-
 cat << _EOF_
 ******************************************************************************
 * NOTICE: Successfully Enabled MediaWiki
 * in ${AP2_CONFIG}
 *
-* You will need to restart your web server to finish the install
+* You will need to point your web browser to
+* http://${AP2_SERVERNAME}/wiki/config
+* To configure your Wiki
 ******************************************************************************
 _EOF_
 

Modified: csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove
===================================================================
--- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove	2009-05-01 02:01:20 UTC (rev 4629)
+++ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove	2009-05-01 03:02:37 UTC (rev 4630)
@@ -8,17 +8,8 @@
 AP2_EXTRADIR=$AP2_CONFDIR/extra
 AP2_CONFIG=$AP2_CONFDIR/httpd.conf
 
-# Disable MediaWiki in httpd.conf
-perl -i -pe 's|^(Include etc/extra/httpd-mediawiki.conf)|#$1|' ${AP2_CONFIG}
+AP2_DOCROOT=`/bin/sed -ne 's/^[\s]*DocumentRoot "\(.*\)"/\1/p' ${AP2_CONFIG}`
+/bin/rm -f ${AP2_DOCROOT}/wiki
 
-cat << _EOF_
-******************************************************************************
-* NOTICE: Successfully Disabled MediaWiki
-* in ${AP2_CONFIG}
-*
-* You will need to restart your web server to finish the removal
-******************************************************************************
-_EOF_
-
 exit 0
 

Deleted: csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW
===================================================================
--- csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW	2009-05-01 02:01:20 UTC (rev 4629)
+++ csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW	2009-05-01 03:02:37 UTC (rev 4630)
@@ -1,12 +0,0 @@
-
-<IfModule alias_module>
-    Alias /MediaWiki /opt/csw/mediawiki
-</IfModule>
-
-<Directory "/opt/csw/mediawiki">
-    AllowOverride None
-    Options None
-    Order allow,deny
-    Allow from all
-</Directory>
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.