Open Build Service

jsj-installtools.changes Changed

CreateConfig Changed

@@ -7,8 +7,9 @@
 FTPDPW=""
 SHOST=""
 YES=""
+LOC=""
 if  $# -lt 1 ; then
-  echo "call: $0 MYSQL=mysqlpassword APACHE=hostname SHOST=s FTPD=ftpdpassword"
+  echo "call: $0 MYSQL=mysqlpassword APACHE=hostname SHOST=s FTPD=ftpdpassword LOC=<jsj|hsbhv|hsb>"
   exit 1
 fi
 while  ! -z $1 ; do
@@ -45,6 +46,17 @@
 			  SHOST="s"
 			fi
 			;;
+	loc=*|LOC=*)	LOC=${1##*=}
+			if  ! -z $LOC ; then
+			  LOC="jsj"
+			fi
+			case $LOC in
+				jsj)	;;
+				hsbhv)	;;
+				hsb)	;;
+				*)	echo LOC $LOC not yet defined!; exit 1;;	
+			esac	
+			;;
 	*)		echo do not know how to deal with $1
 			exit 1
 			;;
@@ -75,7 +87,7 @@
 if  -z $AW ; then YES=no; else YES=$AW; fi
 if  $YES = "yes" ; then
   echo PrepareNagiosTests
-  /usr/share/jsjinstalltools/PrepareNagiosTests
+  /usr/share/jsjinstalltools/PrepareNagiosTests $LOC
   echo $?
   echo
   echo PrepareUpdateCrontab
@@ -83,7 +95,7 @@
   echo $?
   echo
   echo PreparePostfix $SHOST$APACHEHOST
-  /usr/share/jsjinstalltools/PreparePostfix $SHOST$APACHEHOST
+  /usr/share/jsjinstalltools/PreparePostfix $SHOST$APACHEHOST $LOC
   echo $?
   echo
   echo PrepareApacheConfig $APACHEHOST

PrepareNagiosTests Changed

@@ -10,14 +10,16 @@
   *)		echo Variante $VAR nicht vorgesehen, bitte prüfen!; exit;;
 esac
 . /usr/share/jsjinstalltools/GetVersion
-zypper sl -u | egrep "jsj/openSUSE_.*$VERSION" 2>&1 > /dev/null
+zypper sl -u | egrep "botter.cc/jsj" 2>&1 > /dev/null
 if  $? != 0 ; then
-  if  ${VERSION_ID/./} -ge 420 ; then
-     REPOVERSION="Leap_$VERSION"
+  if  ${VERSION_ID/./} -lt 420 ; then
+     REPOVERSION="openSUSE_VERSION"
+  elif  ${VERSION_ID/./} -le 153 ; then
+     REPOVERSION="openSUSE_Leap_$VERSION"
   else
      REPOVERSION="$VERSION"
   fi
-  zypper ar -t  rpm-md -f https://repo.botter.cc/jsj/openSUSE_$REPOVERSION  "jsj_$VERSION"
+  zypper ar -f https://repo.botter.cc/jsj/$REPOVERSION/jsj.repo
 fi
 if  ${VERSION_ID/./} -lt 153 ; then
   INSTALLPACKAGES="nrpe monitoring-plugins-zypper monitoring-plugins-running_kernel check_mk-agent rdiff-backup nrpe-$VAR"
@@ -26,9 +28,6 @@
 fi
 zypper -n in -l $INSTALLPACKAGES
 if  ${VERSION_ID/./} -ge 120 ; then
-  #sed -e '/pid_file/ s/pid_file=.*/pid_file=\/var\/run\/nrpe\/nrpe.pid/' < /etc/nagios/nrpe.cfg > /etc/nagios/nrpe.cfg.new
-  #mv /etc/nagios/nrpe.cfg.new /etc/nagios/nrpe.cfg
-  #cp /etc/nagios/nrpe.cfg /etc
   systemctl enable nrpe.service
   systemctl start nrpe.service
   if  ${VERSION_ID/./} -ge 130 ; then

PreparePostfix Changed

Changes of Revision 96