[csw-devel] SF.net SVN: gar:[11738] csw/mgar/gar/v2/bin

[bdwalton at users.sourceforge.net]

Revision: 11738
          http://gar.svn.sourceforge.net/gar/?rev=11738&view=rev
Author:   bdwalton
Date:     2010-11-28 02:43:04 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
gar/v2: update apache2 config dir in module building script; remove redundant copy as previous changes were comitted

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/ap2mod_build_scripts

Removed Paths:
-------------
    csw/mgar/gar/v2/bin/add_ap2mod_build_scripts

Deleted: csw/mgar/gar/v2/bin/add_ap2mod_build_scripts
===================================================================
--- csw/mgar/gar/v2/bin/add_ap2mod_build_scripts	2010-11-28 02:00:15 UTC (rev 11737)
+++ csw/mgar/gar/v2/bin/add_ap2mod_build_scripts	2010-11-28 02:43:04 UTC (rev 11738)
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-cd "$1"
-
-BUILDSCRIPTS=opt/csw/apache2/ap2mod
-
-for f in $(find . -name "$2" -print0); do
-    modfile=$(basename $f)
-    modname=$(echo $modfile | sed 's/mod_//; s/\.so//')
-    
-
-    [ -d "$BUILDSCRIPTS" ] || mkdir -p "$BUILDSCRIPTS"
-
-    cat <<EOF > $BUILDSCRIPTS/${modname}
-PIR=\${PKG_INSTALL_ROOT:-'/'}
-AP2_PREFIX=/opt/csw/apache2
-AP2_BINDIR=\$AP2_PREFIX/sbin
-AP2_LIBEXEC=\$AP2_PREFIX/libexec
-AP2_CONFDIR=/etc/opt/csw/apache2/
-AP2_CONFIG=\$AP2_CONFDIR/httpd.conf
-AP2_APXS=\$AP2_BINDIR/apxs
-
-if [ "\$1" = install ]; then
-
-echo "File created by \$PKGINST during install.  Please do not remove." > \$PIR/opt/csw/apache2/ap2mod/$modname
-
-# Source csw.conf, if it exists
-if [ -f \$PIR/opt/csw/etc/csw.conf ] ; then
-  . \$PIR/opt/csw/etc/csw.conf
-fi
-if [ -f \$PIR/etc/opt/csw/csw.conf ] ; then
-  . \$PIR/etc/opt/csw/csw.conf
-fi
-
-# Modules will be enabled by default, but a global kill switch
-# is checked , followed by a module specific value.  Thus,
-# either ap2_enable_modules or ap2_enable_suexec (for example)
-# could disable activation of the suexec module.  The 
-#
-# This value is passed to apxs (-a: add, enable; -A: add,
-# disable)
-enmod=-a
-
-if [ "\$ap2_enable_modules" = "no" ]; then
-    enmod=-A
-fi
-
-if [ "\$ap2_enable_suexec" = "no" ]; then
-    enmod=-A
-elif [ "" = "yes" ]; then
-    enmod=-a
-fi
-
-if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then
-    # Add the module module, optionally enabling it by default
-    chroot \$PIR \$AP2_APXS -e \$enmod -n $modname $modfile
-fi
-
-else
-
-rm \$PIR/opt/csw/apache2/ap2mod/$modname
-
-if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then
-  chroot \$PIR \$AP2_APXS -e -A -n $modname $modfile
-fi
-fi
-EOF
-done

Modified: csw/mgar/gar/v2/bin/ap2mod_build_scripts
===================================================================
--- csw/mgar/gar/v2/bin/ap2mod_build_scripts	2010-11-28 02:00:15 UTC (rev 11737)
+++ csw/mgar/gar/v2/bin/ap2mod_build_scripts	2010-11-28 02:43:04 UTC (rev 11738)
@@ -18,7 +18,7 @@
 AP2_PREFIX=/opt/csw/apache2
 AP2_BINDIR=\$AP2_PREFIX/sbin
 AP2_LIBEXEC=\$AP2_PREFIX/libexec
-AP2_CONFDIR=\$AP2_PREFIX/etc
+AP2_CONFDIR=/etc/opt/csw/apache2
 AP2_CONFIG=\$AP2_CONFDIR/httpd.conf
 AP2_APXS=\$AP2_BINDIR/apxs
 


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