Hello community,
here is the log from the commit of package sca-appliance-broker for
openSUSE:Factory checked in at 2018-01-26 13:40:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sca-appliance-broker (Old)
and /work/SRC/openSUSE:Factory/.sca-appliance-broker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-appliance-broker"
Fri Jan 26 13:40:13 2018 rev:3 rq:569735 version:1.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/sca-appliance-broker/sca-appliance-broker.changes
2018-01-19 11:52:53.248559322 +0100
+++
/work/SRC/openSUSE:Factory/.sca-appliance-broker.new/sca-appliance-broker.changes
2018-01-26 13:40:14.279225460 +0100
@@ -1,0 +2,20 @@
+Thu Jan 25 18:57:34 UTC 2018 - [email protected]
+
+- Clarified web user set string (bsc#1077666)
+
+-------------------------------------------------------------------
+Mon Jan 22 20:05:51 UTC 2018 - [email protected]
+
+- Detect web and scripting module
+
+-------------------------------------------------------------------
+Fri Jan 19 19:06:55 UTC 2018 - [email protected]
+
+- Active services as needed or exclude activation with -a
+
+-------------------------------------------------------------------
+Tue Jan 9 18:31:50 UTC 2018 - [email protected]
+
+- Correct ownership of /var/lib/php? (bsc#1075216)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sca-appliance-broker-1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/setup-sca
new/sca-appliance-broker-1.3/bin/setup-sca
--- old/sca-appliance-broker-1.3/bin/setup-sca 2018-01-02 20:55:31.627772150
+0100
+++ new/sca-appliance-broker-1.3/bin/setup-sca 2018-01-25 19:54:05.994477606
+0100
@@ -1,6 +1,6 @@
#!/bin/bash
-SVER='1.0.31_DEV2'
+SVER='1.0.38'
##############################################################################
# setup-sca - SCA Appliance Setup Tool
@@ -8,7 +8,7 @@
#
# Description: Sets up a standard local host configuration of the SCA
# appliance
-# Modified: 2018 Jan 02
+# Modified: 2018 Jan 25
#
##############################################################################
#
@@ -59,6 +59,7 @@
echo
echo 'Options:'
echo ' -h Show this screen and exit'
+ echo ' -a Disable activating services'
echo ' -b Disable Apache and MySQL daemon checks'
echo ' -c <str> Company name'
echo ' -d <str> Company email domain'
@@ -172,6 +173,11 @@
MISSING_PACKAGES="$PACKAGE $MISSING_PACKAGES"
fi
done
+ PHP_DIR="/var/lib/${PHP_VERSION}"
+ SCA_OWNER="wwwrun"
+ if [[ -d $PHP_DIR ]]; then
+ chown $SCA_OWNER $PHP_DIR
+ fi
if [[ -n "$MISSING_PACKAGES" ]]; then
echo 'ERROR'
printf "$FMT1" " Missing required packages:"
"$MISSING_PACKAGES"
@@ -179,7 +185,7 @@
FATAL_ERROR=1
printf "$FMT2" "Web Module"
- if zypper lr 2>/dev/null | grep -i module-web-scripting
&>/dev/null
+ if zypper lr 2>/dev/null | egrep -i
"web-scripting-module|module-web-scripting" &>/dev/null
then
echo 'Installed'
WEB_MODULE=1
@@ -234,23 +240,33 @@
RESTART_APACHE=1
fi
fi
- if (( RESTART_APACHE ))
- then
+ if (( RESTART_APACHE )); then
echo
echo " Run: systemctl restart
apache2.service"
echo
FATAL_ERROR=1
fi
else
- echo "ERROR: $SUB_STATE"
- echo; echo " Run: systemctl start
apache2.service"; echo
- FATAL_ERROR=1
+ if (( ACTIVATE_SERVICES )); then
+ systemctl start apache2.service
&>/dev/null
+ echo "Started"
+ else
+ echo "ERROR: $SUB_STATE"
+ echo; echo " Run: systemctl
start apache2.service"; echo
+ FATAL_ERROR=1
+ fi
fi
else
- echo "ERROR: Disabled"; echo
- echo " Run: systemctl enable apache2.service"
- echo " Run: systemctl start apache2.service";
echo
- FATAL_ERROR=1
+ if (( ACTIVATE_SERVICES )); then
+ systemctl enable apache2.service
&>/dev/null
+ systemctl start apache2.service
&>/dev/null
+ echo "Activated"
+ else
+ echo "ERROR: Disabled"; echo
+ echo " Run: systemctl enable
apache2.service"
+ echo " Run: systemctl start
apache2.service"; echo
+ FATAL_ERROR=1
+ fi
fi
else
echo "ERROR: Not Installed"
@@ -279,16 +295,29 @@
fi
DB_ROOT="-u root -p${PASS_MYSQL_ROOT}"
else
- echo "ERROR: Not Active"
- echo " Run: systemctl start mysql.service"
- echo " Run: mysql_secure_installation"; echo
+ if (( ACTIVATE_SERVICES )); then
+ systemctl start mysql.service
&>/dev/null
+ echo "Started"; echo
+ echo " Run:
mysql_secure_installation"; echo
+ else
+ echo "ERROR: Not Active"
+ echo " Run: systemctl start
mysql.service"
+ echo " Run:
mysql_secure_installation"; echo
+ fi
FATAL_ERROR=1
fi
else
- echo "ERROR: Disabled"; echo
- echo " Run: systemctl enable mysql.service"
- echo " Run: systemctl start mysql.service"
- echo " Run: mysql_secure_installation"; echo
+ if (( ACTIVATE_SERVICES )); then
+ systemctl enable mysql.service &>/dev/null
+ systemctl start mysql.service &>/dev/null
+ echo "Activated"; echo
+ echo " Run: mysql_secure_installation"; echo
+ else
+ echo "ERROR: Disabled"; echo
+ echo " Run: systemctl enable mysql.service"
+ echo " Run: systemctl start mysql.service"
+ echo " Run: mysql_secure_installation"; echo
+ fi
FATAL_ERROR=1
fi
else
@@ -415,7 +444,7 @@
{
if [[ -z "$PASS_WEB_USER" ]]; then
printf "$FMT1" "Web User Password" "Not Set"
- printf "%s" " Enter Web User password: "
+ printf "%s" " Set Web User password: "
read -s PASS_WEB_USER
echo
else
@@ -507,16 +536,18 @@
FATAL_ERROR=0
INSTALL_SDP_CONFIRMED=0
FTP_INSTALL=0
+ACTIVATE_SERVICES=1
############################################################################
# main
############################################################################
-while getopts ':bc:d:hp:w:e:fys:' TMPOPT
+while getopts ':abc:d:hp:w:e:fys:' TMPOPT
do
case $TMPOPT in
\:) title; showHelp "ERROR: Missing Argument -$OPTARG"; exit 1
;;
\?) title; showHelp "ERROR: Invalid Option -$OPTARG"; exit 2 ;;
h) title; showHelp; exit 0 ;;
+ a) ACTIVATE_SERVICES=0 ;;
b) DAEMON_CHECK=0 ;;
c) COMPANY_NAME=$OPTARG ;;
d) EMAIL_DOMAIN=$OPTARG ;;
