reorder content to match original

packaging/centos7/tomcat7/db.properties

@@ -1,101 +1,101 @@
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
-db.usage.maxActive=100
 # distributed with this work for additional information
-
-
-# to you under the Apache License, Version 2.0 (the
-# with the License.  You may obtain a copy of the License at
-# "License"); you may not use this file except in compliance
-#   http://www.apache.org/licenses/LICENSE-2.0
-# software distributed under the License is distributed on an
 # regarding copyright ownership.  The ASF licenses this file
-# Unless required by applicable law or agreed to in writing,
-db.cloud.name=cloud
-db.cloud.password=ENC(vlzQjmqOV4s5q7n+S1OMbA==)
-# specific language governing permissions and limitations
-# KIND, either express or implied.  See the License for the
-
+# 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
 # 
-
-
-
-# in which the management server(Tomcat) is running
+#   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
-
-# usage database tuning parameters
-
-db.usage.maxWait=10000
-db.cloud.port=3306
-# High Availability And Cluster Properties
-db.usage.maxIdle=30
-# CloudStack database settings
+# in which the management server(Tomcat) is running
 cluster.node.IP=127.0.0.1
-db.cloud.testOnBorrow=true
-db.cloud.maxIdle=30
-db.cloud.autoReconnectForPools=true
-db.cloud.trustStore=
-region.id=1
 cluster.servlet.port=9090
-db.cloud.host=localhost
-db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
-# CloudStack database tuning parameters
-db.usage.name=cloud_usage
-db.cloud.poolPreparedStatements=false
-db.ha.enabled=false
-db.cloud.keyStorePassphrase=vmops.com
-db.simulator.maxActive=250
+region.id=1
+
+# CloudStack database settings
 db.cloud.username=cloud
-db.usage.port=3306
-db.cloud.maxWait=10000
-db.cloud.timeBetweenEvictionRunsMillis=40000
-db.cloud.keyStorePassword=
-# usage database settings
-db.cloud.queriesBeforeRetryMaster=5000
-db.cloud.validationQuery=SELECT 1
-db.usage.failOverReadOnly=false
+db.cloud.password=ENC(vlzQjmqOV4s5q7n+S1OMbA==)
+db.cloud.host=localhost
+db.cloud.port=3306
+db.cloud.name=cloud
+
+# CloudStack database tuning parameters
 db.cloud.maxActive=250
-
-db.cloud.useSSL=false
-db.usage.host=localhost
-db.cloud.initialTimeout=3600
-# Encryption Settings
-db.cloud.minEvictableIdleTimeMillis=240000
+db.cloud.maxIdle=30
+db.cloud.maxWait=10000
+db.cloud.validationQuery=SELECT 1
+db.cloud.testOnBorrow=true
 db.cloud.testWhileIdle=true
-# CloudStack database SSL settings
-db.cloud.slaves=localhost,localhost
-db.simulator.maxIdle=30
-db.cloud.keyStore=
-db.cloud.encrypt.secret=ENC(zaGuSF5a4KyWayn2t0yyjDa0HjdToVtZ)
-db.cloud.encryption.type=file
-db.cloud.failOverReadOnly=false
+db.cloud.timeBetweenEvictionRunsMillis=40000
+db.cloud.minEvictableIdleTimeMillis=240000
+db.cloud.poolPreparedStatements=false
+db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
 
-db.simulator.port=3306
+# CloudStack database SSL settings
+db.cloud.useSSL=false
+db.cloud.keyStore=
+db.cloud.keyStorePassword=
+db.cloud.trustStore=
+db.cloud.trustStorePassword=
+db.cloud.keyStorePassphrase=vmops.com
+
+# Encryption Settings
+db.cloud.encryption.type=file
+db.cloud.encrypt.secret=ENC(zaGuSF5a4KyWayn2t0yyjDa0HjdToVtZ)
+
+# usage database settings
 db.usage.password=ENC(cQEcN5aVucSYK+WUkPjDcw==)
 db.usage.username=cloud
-db.cloud.trustStorePassword=
-db.simulator.username=cloud
+db.usage.host=localhost
+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.url.params=
-db.usage.initialTimeout=3600
 
 # Simulator database settings
-db.cloud.reconnectAtTxEnd=true
-db.usage.autoReconnect=true
-#usage Database
-db.simulator.maxWait=10000
-# cloud stack Database
+db.simulator.username=cloud
 db.simulator.password=cloud
-db.usage.reconnectAtTxEnd=true
+db.simulator.host=localhost
+db.simulator.port=3306
+db.simulator.name=simulator
+db.simulator.maxActive=250
+db.simulator.maxIdle=30
+db.simulator.maxWait=10000
 db.simulator.autoReconnect=true
 
+
+# High Availability And Cluster Properties
+db.ha.enabled=false
 db.ha.loadBalanceStrategy=com.cloud.utils.db.StaticStrategy
+# cloud stack Database
+db.cloud.slaves=localhost,localhost
 db.cloud.autoReconnect=true
-db.simulator.host=localhost
-db.simulator.name=simulator
-db.usage.queriesBeforeRetryMaster=5000
-db.usage.slaves=localhost,localhost
-db.usage.secondsBeforeRetryMaster=3600
-db.usage.autoReconnectForPools=true
+db.cloud.failOverReadOnly=false
+db.cloud.reconnectAtTxEnd=true
+db.cloud.autoReconnectForPools=true
 db.cloud.secondsBeforeRetryMaster=3600
+db.cloud.queriesBeforeRetryMaster=5000
+db.cloud.initialTimeout=3600
+
+#usage Database
+db.usage.slaves=localhost,localhost
+db.usage.autoReconnect=true
+db.usage.failOverReadOnly=false
+db.usage.reconnectAtTxEnd=true
+db.usage.autoReconnectForPools=true
+db.usage.secondsBeforeRetryMaster=3600
+db.usage.queriesBeforeRetryMaster=5000
+db.usage.initialTimeout=3600