This is an automated email from the ASF dual-hosted git repository.
gabriel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 463372b packaging: management default file cleanup (#3139)
new ff07c17 Foward merge #3139 from 4.11 to master (4.12)
463372b is described below
commit 463372bc7ea13e15c1ec0aa8808095bb2e053d07
Author: Rohit Yadav <ro...@apache.org>
AuthorDate: Fri Jan 25 22:19:33 2019 +0530
packaging: management default file cleanup (#3139)
This cleanups management server default file, the `cloud.jks` is no
longer created by the management server but instead created in-memory
by the root CA plugin on management server startup.
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
client/conf/java.security.ciphers.in | 32 ++++++++++++-------------
packaging/systemd/cloudstack-management.default | 6 +----
2 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/client/conf/java.security.ciphers.in
b/client/conf/java.security.ciphers.in
index 27e2d69..6e7620e 100644
--- a/client/conf/java.security.ciphers.in
+++ b/client/conf/java.security.ciphers.in
@@ -1,18 +1,18 @@
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
jdk.tls.disabledAlgorithms=SSLv2Hello, SSLv3, TLSv1, TLSv1.1, DH keySize <
128, RSA keySize < 128, DES keySize < 128, SHA1 keySize < 128, MD5 keySize <
128, RC4
diff --git a/packaging/systemd/cloudstack-management.default
b/packaging/systemd/cloudstack-management.default
index fbdb256..8610e03 100644
--- a/packaging/systemd/cloudstack-management.default
+++ b/packaging/systemd/cloudstack-management.default
@@ -18,11 +18,7 @@
# Where your java installation lives
#JAVA_HOME="/usr/lib/jvm/java"
-if [ -r "/etc/cloudstack/management/cloud.jks" ] ; then
- JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloud.jks
-Djavax.net.ssl.trustStorePassword=vmops.com
-Djava.security.properties=/etc/cloudstack/management/java.security.ciphers "
-else
- JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djava.security.properties=/etc/cloudstack/management/java.security.ciphers "
-fi
+JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djava.security.properties=/etc/cloudstack/management/java.security.ciphers "
CLOUDSTACK_USER="cloud"
