From 404f1b2f3e089f5454614e0fd42f05d1d8c247ec Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 25 Jan 2019 22:20:07 +0530 Subject: [PATCH] client: cleanup old java.security.ciphers tomcat config This removes old tomcat specific java.security.ciphers file that no longer overrides and disables JAVA TLS algorithms. The preferred way is to configure the global java.security file in `$JRE_HOME/lib/security/java.security`. Signed-off-by: Rohit Yadav --- client/conf/java.security.ciphers.in | 18 ------------------ debian/cloudstack-management.install | 1 - packaging/centos63/cloud.spec | 3 +-- packaging/centos7/cloud.spec | 3 +-- .../systemd/cloudstack-management.default | 2 +- 5 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 client/conf/java.security.ciphers.in diff --git a/client/conf/java.security.ciphers.in b/client/conf/java.security.ciphers.in deleted file mode 100644 index 6e7620e69c37..000000000000 --- a/client/conf/java.security.ciphers.in +++ /dev/null @@ -1,18 +0,0 @@ -# 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/debian/cloudstack-management.install b/debian/cloudstack-management.install index bb241fbec372..23087912c3a0 100644 --- a/debian/cloudstack-management.install +++ b/debian/cloudstack-management.install @@ -19,7 +19,6 @@ /etc/cloudstack/management/db.properties /etc/cloudstack/management/environment.properties /etc/cloudstack/management/server.properties -/etc/cloudstack/management/java.security.ciphers /etc/cloudstack/management/log4j-cloud.xml /etc/default/cloudstack-management /etc/init.d/cloudstack-management diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index a957380fff74..a3b2b3270a08 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -291,7 +291,7 @@ cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms -for name in db.properties server.properties log4j-cloud.xml commons-logging.properties environment.properties java.security.ciphers +for name in db.properties server.properties log4j-cloud.xml commons-logging.properties environment.properties do cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name done @@ -539,7 +539,6 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml %config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties %attr(0755,root,root) %{_initrddir}/%{name}-management %attr(0755,root,root) %{_bindir}/%{name}-setup-management diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index 1cc89939caec..0be39609ca99 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -262,7 +262,7 @@ cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms -for name in db.properties server.properties log4j-cloud.xml commons-logging.properties environment.properties java.security.ciphers +for name in db.properties server.properties log4j-cloud.xml commons-logging.properties environment.properties do cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name done @@ -484,7 +484,6 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml %config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties %attr(0644,root,root) %{_unitdir}/%{name}-management.service %attr(0755,cloud,cloud) %{_localstatedir}/run/%{name}-management.pid diff --git a/packaging/systemd/cloudstack-management.default b/packaging/systemd/cloudstack-management.default index 8610e03d1151..678bb0f23b0b 100644 --- a/packaging/systemd/cloudstack-management.default +++ b/packaging/systemd/cloudstack-management.default @@ -18,7 +18,7 @@ # Where your java installation lives #JAVA_HOME="/usr/lib/jvm/java" -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 " +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 " CLOUDSTACK_USER="cloud"