Open Build Service

jsj-installtools.changes Changed

CreateConfig Changed

@@ -39,6 +39,11 @@
 			  exit 1
 			fi
 			;;
+	shost=*|SHOST=*)	SHOST=${1##*=}
+			if  ! -z $SHOST ; then
+			  SHOST="s"
+			fi
+			;;
 	*)		echo do not know how to deal with $1
 			exit 1
 			;;
@@ -57,8 +62,9 @@
 	1)	echo yes.
 		echo "                                   $MYSQLPW";;
 esac
-echo "Setup apache for hostname(s):      $APACHEHOST"
-echo "Setup ftpd to apache for User:     $APACHEHOST w/ PW $FTPDPW"
+echo "Setup apache for hostname(s):              $APACHEHOST"
+echo "Setup apache for support hostname(s):      $SHOST$APACHEHOST"
+echo "Setup ftpd to apache for User:             $APACHEHOST w/ PW $FTPDPW"
 echo "correct? (yes/NO)"
 read AW
 if  -z $AW ; then YES=no; else YES=$AW; fi
@@ -72,11 +78,11 @@
   echo $?
   echo
   echo PreparePostfix s$APACHEHOST
-  /usr/share/jsjinstalltools/PreparePostfix s$APACHEHOST
+  /usr/share/jsjinstalltools/PreparePostfix $SHOST$APACHEHOST
   echo $?
   echo
   echo PrepareApacheConfig $APACHEHOST
-  /usr/share/jsjinstalltools/PrepareApacheConfig $APACHEHOST
+  /usr/share/jsjinstalltools/PrepareApacheConfig $APACHEHOST $SHOST
   echo $?
   echo
   if  $FTPD = 1 ; then

PrepareApacheConfig Changed

@@ -1,11 +1,17 @@
 #!/bin/bash
 HOSTNAME=$1
+SHOST=$2
 JSJSHARE="/usr/share/jsjinstalltools"
 . /usr/share/jsjinstalltools/GetVersion
 if  -z $HOSTNAME ; then
   echo call: $0 hostname
   exit 1
 fi
+if  -z $SHOST ; then
+  SHOST=""
+else
+  SHOST="s"
+fi
 echo $HOSTNAME
 zypper -n in -l phpMyAdmin
 for h in $HOSTNAME s$HOSTNAME; do
@@ -14,7 +20,7 @@
 chmod 775 /srv/www/$HOSTNAME/*
 chgrp www /srv/www/$HOSTNAME/*
 if  -f $JSJSHARE/nagiosok.html ; then
-  cp $JSJSHARE/nagiosok.html /srv/www/s$HOSTNAME/htdocs
+  cp $JSJSHARE/nagiosok.html /srv/www/$SHOST$HOSTNAME/htdocs
 else
   echo no file nagiosok.html
   exit 1
@@ -27,7 +33,9 @@
 fi
 if  -f $JSJSHARE/vhost.conf ; then
   sed -e "s/HOSTNAME/$HOSTNAME/" < $JSJSHARE/vhost.conf > /etc/apache2/vhosts.d/$HOSTNAME.conf
-  sed -e "s/HOSTNAME/s$HOSTNAME/" < $JSJSHARE/vhost.conf > /etc/apache2/vhosts.d/s$HOSTNAME.conf
+  if  x$SHOST = xs ; then
+    sed -e "s/HOSTNAME/s$HOSTNAME/" < $JSJSHARE/vhost.conf > /etc/apache2/vhosts.d/s$HOSTNAME.conf
+  fi
   if  ${VERSION_ID%%.*} -ge 13 ; then
     sed -i -e '/^ *Order .*allow/ i\ \ \ \ \ \ \ \ Require all granted' \
            -e '/^ *Order .*allow/ d' \

Changes of Revision 57