[csw-devel] SF.net SVN: gar:[11200] csw/mgar/pkg/apache2/trunk/files/CSWapache2. postinstall

[bdwalton at users.sourceforge.net]

Revision: 11200
          http://gar.svn.sourceforge.net/gar/?rev=11200&view=rev
Author:   bdwalton
Date:     2010-10-09 00:49:26 +0000 (Sat, 09 Oct 2010)

Log Message:
-----------
apache2: postinstall: disable debug; use hostname in cert

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall

Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall	2010-10-08 23:03:07 UTC (rev 11199)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall	2010-10-09 00:49:26 UTC (rev 11200)
@@ -8,6 +8,8 @@
 AP2_CONFDIR=$AP2_PREFIX/etc
 AP2_EXTRADIR=$AP2_CONFDIR/extra
 
+
+
 UPGRADE_CONFIGS="\
     httpd.conf \
     ssl.conf \
@@ -16,6 +18,8 @@
     "
 # Don't overwrite config if it exists
 warn_update=0
+# For use in config files and certificate generation
+hostname=`hostname`
 echo "Checking configuration files:"
 for file in $UPGRADE_CONFIGS; do
     config=$AP2_CONFDIR/$file
@@ -29,7 +33,6 @@
         perl -i -plne 's#PidFile /var#PidFile var#'
     elif [ -f "$config.CSW" ]; then
         echo "Creating $config from template"
-        hostname=`hostname`
         sed -e s, at HOSTNAME@,$hostname,g   \
             -e s, at USER@,nobody,g          \
             -e s, at GROUP@,nobody,g         \
@@ -77,14 +80,13 @@
     echo Generating dummy ssl key and certificate...
     # this is likely overkill for a dummy cert, but why not
     umask 0077
-    set -x
-    cat <<EOF | /usr/sbin/chroot ${ROOT} /opt/csw/bin/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout /opt/csw/apache2/etc/server.key  -out /opt/csw/apache2/etc/server.crt >/dev/null
+    cat <<EOF | /usr/sbin/chroot ${ROOT} /opt/csw/bin/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout /opt/csw/apache2/etc/server.key  -out /opt/csw/apache2/etc/server.crt >/dev/null 2>&1
 TS
 Westfarthing
 Hobbiton
 
 
-Bilbo Baggins
+$hostname
 bilbo at example.net
 
 


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