This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
new 7d5f15e centos63: make it work
7d5f15e is described below
commit 7d5f15e2563b10d8ad2e5e108eed5879a02188fb
Author: Rohit Yadav <[email protected]>
AuthorDate: Mon Aug 7 23:17:55 2017 +0200
centos63: make it work
Signed-off-by: Rohit Yadav <[email protected]>
---
packaging/centos63/cloud-management.rc | 6 ++++--
packaging/centos63/cloud.spec | 3 +++
packaging/centos7/cloud.spec | 1 +
setup/bindir/cloud-setup-databases.in | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/packaging/centos63/cloud-management.rc
b/packaging/centos63/cloud-management.rc
index b8babea..8d640e9 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -39,6 +39,8 @@ PROG="jsvc"
DAEMON="/usr/bin/jsvc"
USER=cloud
+export HOME="/var/cloudstack/management"
+
unset OPTIONS
[ -r /etc/sysconfig/default/"$SHORTNAME" ] && source
/etc/sysconfig/default/"$SHORTNAME"
@@ -68,7 +70,7 @@ setJavaHome() {
setJavaHome
-JARS=$(ls /usr/share/cloudstack-management/lib/\*.jar | tr '\n' ':' | sed
s'/.$//')
+JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed
s'/.$//')
CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/cloud-management-server.jar:$JARS"
if [ -r "/etc/cloudstack/management/cloudmanagementserver.keystore" ] ; then
@@ -93,7 +95,7 @@ start() {
echo -n "Starting $PROGNAME" "$SHORTNAME"
if daemon --pidfile $PIDFILE $DAEMON -home "$JAVA_HOME" -cp "$CLASSPATH"
-pidfile "$PIDFILE" -user "$USER" \
- -errfile $LOGDIR/cloudstack-management.err -outfile
$LOGDIR/cloudstack-management.out $JAVA_OPTS $CLASS
+ -errfile $LOGDIR/cloudstack-management.err $JAVA_OPTS $CLASS
RETVAL=$?
then
rc=0
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 760b240..884e31e 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -59,6 +59,9 @@ intelligent IaaS cloud implementation.
%package management
Summary: CloudStack management server UI
Requires: java-1.8.0-openjdk
+Requires: jsvc
+Requires: jakarta-commons-daemon
+Requires: jakarta-commons-daemon-jsvc
Requires: python
Requires: bash
Requires: bzip2
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index ff96414..530bafb 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -59,6 +59,7 @@ intelligent IaaS cloud implementation.
%package management
Summary: CloudStack management server UI
Requires: java => 1.8.0
+Requires: apache-commons-daemon-jsvc
Requires: python
Requires: bash
Requires: bzip2
diff --git a/setup/bindir/cloud-setup-databases.in
b/setup/bindir/cloud-setup-databases.in
index 08a3cc9..0e66cfa 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -388,7 +388,7 @@ for example:
def processEncryptionStuff(self):
def encrypt(input):
- cmd = ['java','-classpath','"' + self.encryptionJarPath +
'"','org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI', 'encrypt.sh',
'input=%s'%input, 'password=%s'%self.mgmtsecretkey,'verbose=false']
+ cmd =
['java','-Djava.security.egd=file:/dev/urandom','-classpath','"' +
self.encryptionJarPath +
'"','org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI', 'encrypt.sh',
'input=%s'%input, 'password=%s'%self.mgmtsecretkey,'verbose=false']
return runCmd(cmd).strip('\r\n')
def saveMgmtServerSecretKey():
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
