Skip to content

Commit c84bb6b

Browse files
author
David Amorim Faria
committed
reorder content to match original
1 parent f948e96 commit c84bb6b

1 file changed

Lines changed: 68 additions & 68 deletions

File tree

‎packaging/centos7/tomcat7/db.properties‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,101 @@
11
# Licensed to the Apache Software Foundation (ASF) under one
22
# or more contributor license agreements. See the NOTICE file
3-
db.usage.maxActive=100
43
# distributed with this work for additional information
5-
6-
4+
# regarding copyright ownership. The ASF licenses this file
75
# to you under the Apache License, Version 2.0 (the
8-
# with the License. You may obtain a copy of the License at
96
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
109
# http://www.apache.org/licenses/LICENSE-2.0
11-
# software distributed under the License is distributed on an
12-
# regarding copyright ownership. The ASF licenses this file
10+
#
1311
# Unless required by applicable law or agreed to in writing,
14-
db.cloud.name=cloud
15-
db.cloud.password=ENC(vlzQjmqOV4s5q7n+S1OMbA==)
16-
# specific language governing permissions and limitations
17-
# KIND, either express or implied. See the License for the
18-
19-
#
20-
21-
22-
23-
# in which the management server(Tomcat) is running
12+
# software distributed under the License is distributed on an
2413
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
2516
# under the License.
26-
# management server clustering parameters, change cluster.node.IP to the machine IP address
2717

28-
# usage database tuning parameters
29-
30-
db.usage.maxWait=10000
31-
db.cloud.port=3306
32-
# High Availability And Cluster Properties
33-
db.usage.maxIdle=30
34-
# CloudStack database settings
18+
# management server clustering parameters, change cluster.node.IP to the machine IP address
19+
# in which the management server(Tomcat) is running
3520
cluster.node.IP=127.0.0.1
36-
db.cloud.testOnBorrow=true
37-
db.cloud.maxIdle=30
38-
db.cloud.autoReconnectForPools=true
39-
db.cloud.trustStore=
40-
region.id=1
4121
cluster.servlet.port=9090
22+
region.id=1
23+
24+
# CloudStack database settings
25+
db.cloud.username=cloud
26+
db.cloud.password=ENC(vlzQjmqOV4s5q7n+S1OMbA==)
4227
db.cloud.host=localhost
43-
db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
28+
db.cloud.port=3306
29+
db.cloud.name=cloud
30+
4431
# CloudStack database tuning parameters
45-
db.usage.name=cloud_usage
46-
db.cloud.poolPreparedStatements=false
47-
db.ha.enabled=false
48-
db.cloud.keyStorePassphrase=vmops.com
49-
db.simulator.maxActive=250
50-
db.cloud.username=cloud
51-
db.usage.port=3306
32+
db.cloud.maxActive=250
33+
db.cloud.maxIdle=30
5234
db.cloud.maxWait=10000
53-
db.cloud.timeBetweenEvictionRunsMillis=40000
54-
db.cloud.keyStorePassword=
55-
# usage database settings
56-
db.cloud.queriesBeforeRetryMaster=5000
5735
db.cloud.validationQuery=SELECT 1
58-
db.usage.failOverReadOnly=false
59-
db.cloud.maxActive=250
60-
61-
db.cloud.useSSL=false
62-
db.usage.host=localhost
63-
db.cloud.initialTimeout=3600
64-
# Encryption Settings
65-
db.cloud.minEvictableIdleTimeMillis=240000
36+
db.cloud.testOnBorrow=true
6637
db.cloud.testWhileIdle=true
38+
db.cloud.timeBetweenEvictionRunsMillis=40000
39+
db.cloud.minEvictableIdleTimeMillis=240000
40+
db.cloud.poolPreparedStatements=false
41+
db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
42+
6743
# CloudStack database SSL settings
68-
db.cloud.slaves=localhost,localhost
69-
db.simulator.maxIdle=30
44+
db.cloud.useSSL=false
7045
db.cloud.keyStore=
71-
db.cloud.encrypt.secret=ENC(zaGuSF5a4KyWayn2t0yyjDa0HjdToVtZ)
46+
db.cloud.keyStorePassword=
47+
db.cloud.trustStore=
48+
db.cloud.trustStorePassword=
49+
db.cloud.keyStorePassphrase=vmops.com
50+
51+
# Encryption Settings
7252
db.cloud.encryption.type=file
73-
db.cloud.failOverReadOnly=false
53+
db.cloud.encrypt.secret=ENC(zaGuSF5a4KyWayn2t0yyjDa0HjdToVtZ)
7454

75-
db.simulator.port=3306
55+
# usage database settings
7656
db.usage.password=ENC(cQEcN5aVucSYK+WUkPjDcw==)
7757
db.usage.username=cloud
78-
db.cloud.trustStorePassword=
79-
db.simulator.username=cloud
58+
db.usage.host=localhost
59+
db.usage.port=3306
60+
db.usage.name=cloud_usage
61+
62+
# usage database tuning parameters
63+
db.usage.maxActive=100
64+
db.usage.maxIdle=30
65+
db.usage.maxWait=10000
8066
db.usage.url.params=
81-
db.usage.initialTimeout=3600
8267

8368
# Simulator database settings
84-
db.cloud.reconnectAtTxEnd=true
85-
db.usage.autoReconnect=true
86-
#usage Database
87-
db.simulator.maxWait=10000
88-
# cloud stack Database
69+
db.simulator.username=cloud
8970
db.simulator.password=cloud
90-
db.usage.reconnectAtTxEnd=true
71+
db.simulator.host=localhost
72+
db.simulator.port=3306
73+
db.simulator.name=simulator
74+
db.simulator.maxActive=250
75+
db.simulator.maxIdle=30
76+
db.simulator.maxWait=10000
9177
db.simulator.autoReconnect=true
9278

79+
80+
# High Availability And Cluster Properties
81+
db.ha.enabled=false
9382
db.ha.loadBalanceStrategy=com.cloud.utils.db.StaticStrategy
83+
# cloud stack Database
84+
db.cloud.slaves=localhost,localhost
9485
db.cloud.autoReconnect=true
95-
db.simulator.host=localhost
96-
db.simulator.name=simulator
97-
db.usage.queriesBeforeRetryMaster=5000
86+
db.cloud.failOverReadOnly=false
87+
db.cloud.reconnectAtTxEnd=true
88+
db.cloud.autoReconnectForPools=true
89+
db.cloud.secondsBeforeRetryMaster=3600
90+
db.cloud.queriesBeforeRetryMaster=5000
91+
db.cloud.initialTimeout=3600
92+
93+
#usage Database
9894
db.usage.slaves=localhost,localhost
99-
db.usage.secondsBeforeRetryMaster=3600
95+
db.usage.autoReconnect=true
96+
db.usage.failOverReadOnly=false
97+
db.usage.reconnectAtTxEnd=true
10098
db.usage.autoReconnectForPools=true
101-
db.cloud.secondsBeforeRetryMaster=3600
99+
db.usage.secondsBeforeRetryMaster=3600
100+
db.usage.queriesBeforeRetryMaster=5000
101+
db.usage.initialTimeout=3600

0 commit comments

Comments
 (0)