You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/04/05 16:17:28 UTC
[2/5] git commit: updated refs/heads/4.1 to a14285e
Remove db-enc.properties
This seemed to be used with Ant, but there is no other reference to this file.
It shouldn't be here and isn't used. It only confuses people.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ba29f3d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ba29f3d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ba29f3d
Branch: refs/heads/4.1
Commit: 9ba29f3d3ecaa405be1a4662403fe33388836379
Parents: 7cbd8f5
Author: Wido den Hollander <wi...@42on.com>
Authored: Wed Apr 3 19:21:11 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Apr 5 16:16:27 2013 +0200
----------------------------------------------------------------------
client/tomcatconf/db-enc.properties.in | 68 ---------------------------
debian/cloudstack-management.postinst | 2 +-
packaging/centos63/cloud.spec | 2 +-
3 files changed, 2 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ba29f3d/client/tomcatconf/db-enc.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/db-enc.properties.in b/client/tomcatconf/db-enc.properties.in
deleted file mode 100644
index a9404fa..0000000
--- a/client/tomcatconf/db-enc.properties.in
+++ /dev/null
@@ -1,68 +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.
-
-# management server clustering parameters, change cluster.node.IP to the machine IP address
-# in which the management server(Tomcat) is running
-cluster.node.IP=127.0.0.1
-cluster.servlet.port=9090
-
-# CloudStack database settings
-db.cloud.username=@DBUSER@
-db.cloud.password=@DBPW@
-db.cloud.host=@DBHOST@
-db.cloud.port=3306
-db.cloud.name=cloud
-
-# CloudStack database tuning parameters
-db.cloud.maxActive=250
-db.cloud.maxIdle=30
-db.cloud.maxWait=10000
-db.cloud.autoReconnect=true
-db.cloud.validationQuery=SELECT 1
-db.cloud.testOnBorrow=true
-db.cloud.testWhileIdle=true
-db.cloud.timeBetweenEvictionRunsMillis=40000
-db.cloud.minEvictableIdleTimeMillis=240000
-db.cloud.poolPreparedStatements=false
-db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
-
-# CloudStack database SSL settings
-db.cloud.useSSL=false
-db.cloud.keyStore=
-db.cloud.keyStorePassword=
-db.cloud.trustStore=
-db.cloud.trustStorePassword=
-
-# Encryption Settings
-db.cloud.encryption.type=file
-db.cloud.encrypt.secret=password
-
-# usage database settings
-db.usage.username=@DBUSER@
-db.usage.password=@DBPW@
-db.usage.host=@DBHOST@
-db.usage.port=3306
-db.usage.name=cloud_usage
-
-# usage database tuning parameters
-db.usage.maxActive=100
-db.usage.maxIdle=30
-db.usage.maxWait=10000
-db.usage.autoReconnect=true
-
-# awsapi database settings
-db.awsapi.name=cloudbridge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ba29f3d/debian/cloudstack-management.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index 293810a..08df3c7 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -38,7 +38,7 @@ if [ "$1" = configure ]; then
OLDCONFDIR="/etc/cloud/management"
NEWCONFDIR="/etc/cloudstack/management"
- CONFFILES="db.properties db-enc.properties cloud.keystore key"
+ CONFFILES="db.properties cloud.keystore key"
# Copy old configuration so the admin doesn't have to do that
# Only do so when we are installing for the first time
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ba29f3d/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 621848f..c91c629 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -236,7 +236,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \
- catalina.policy catalina.properties db-enc.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do
+ catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done