Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BDD2C2BD for ; Thu, 11 Jul 2013 05:57:52 +0000 (UTC) Received: (qmail 26310 invoked by uid 500); 11 Jul 2013 05:57:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 26275 invoked by uid 500); 11 Jul 2013 05:57:52 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 26252 invoked by uid 99); 11 Jul 2013 05:57:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jul 2013 05:57:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 46A5B88F001; Thu, 11 Jul 2013 05:57:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gavinlee@apache.org To: commits@cloudstack.apache.org Message-Id: <2142937cc1b44665b089b0754908cdf1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to ea4142b Date: Thu, 11 Jul 2013 05:57:51 +0000 (UTC) Updated Branches: refs/heads/4.2 ecd2a273c -> ea4142bde [DOC]configuration path refactor /etc/cloud to /etc/cloudstack CLOUDSTACK-3182 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea4142bd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea4142bd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea4142bd Branch: refs/heads/4.2 Commit: ea4142bdea54ace62753d655929744a30ead6ccd Parents: ecd2a27 Author: Gavin Lee Authored: Thu Jul 11 13:50:15 2013 +0800 Committer: Gavin Lee Committed: Thu Jul 11 13:57:26 2013 +0800 ---------------------------------------------------------------------- docs/en-US/aws-ec2-configuration.xml | 4 ++-- docs/en-US/change-database-config.xml | 2 +- docs/en-US/change-database-password.xml | 10 +++++----- docs/en-US/increase-management-server-max-memory.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea4142bd/docs/en-US/aws-ec2-configuration.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/aws-ec2-configuration.xml b/docs/en-US/aws-ec2-configuration.xml index d6dd2b5..f0f2d0f 100644 --- a/docs/en-US/aws-ec2-configuration.xml +++ b/docs/en-US/aws-ec2-configuration.xml @@ -95,8 +95,8 @@ (Optional) The AWS API listens for requests on port 7080. If you prefer AWS API to listen on another port, you can change it as follows: - Edit the files /etc/cloud/management/server.xml, /etc/cloud/management/server-nonssl.xml, - and /etc/cloud/management/server-ssl.xml. + Edit the files /etc/cloudstack/management/server.xml, /etc/cloudstack/management/server-nonssl.xml, + and /etc/cloudstack/management/server-ssl.xml. In each file, find the tag <Service name="Catalina7080">. Under this tag, locate <Connector executor="tomcatThreadPool-internal" port= ....<. Change the port to whatever port you want to use, then save the files. http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea4142bd/docs/en-US/change-database-config.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/change-database-config.xml b/docs/en-US/change-database-config.xml index 34e7672..567b9e4 100644 --- a/docs/en-US/change-database-config.xml +++ b/docs/en-US/change-database-config.xml @@ -24,5 +24,5 @@
Changing the Database Configuration - The &PRODUCT; Management Server stores database configuration information (e.g., hostname, port, credentials) in the file /etc/cloud/management/db.properties. To effect a change, edit this file on each Management Server, then restart the Management Server. + The &PRODUCT; Management Server stores database configuration information (e.g., hostname, port, credentials) in the file /etc/cloudstack/management/db.properties. To effect a change, edit this file on each Management Server, then restart the Management Server.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea4142bd/docs/en-US/change-database-password.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/change-database-password.xml b/docs/en-US/change-database-password.xml index b0021a4..863984e 100644 --- a/docs/en-US/change-database-password.xml +++ b/docs/en-US/change-database-password.xml @@ -24,7 +24,7 @@
Changing the Database Password - You may need to change the password for the MySQL account used by CloudStack. If so, you'll need to change the password in MySQL, and then add the encrypted password to /etc/cloud/management/db.properties. + You may need to change the password for the MySQL account used by CloudStack. If so, you'll need to change the password in MySQL, and then add the encrypted password to /etc/cloudstack/management/db.properties. Before changing the password, you'll need to stop CloudStack's management server and the usage engine if you've deployed that component. @@ -46,11 +46,11 @@ - The next step is to encrypt the password and copy the encrypted password to CloudStack's database configuration (/etc/cloud/management/db.properties). + The next step is to encrypt the password and copy the encrypted password to CloudStack's database configuration (/etc/cloudstack/management/db.properties). -# java -classpath /usr/share/java/cloud-jasypt-1.8.jar \ + # java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ -input="newpassword123" password="`cat /etc/cloud/management/key`" \ +input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false @@ -59,7 +59,7 @@ verbose=false - Now, you'll update /etc/cloud/management/db.properties with the new ciphertext. Open /etc/cloud/management/db.properties in a text editor, and update these parameters: + Now, you'll update /etc/cloudstack/management/db.properties with the new ciphertext. Open /etc/cloudstack/management/db.properties in a text editor, and update these parameters: db.cloud.password=ENC(encrypted_password_from_above) db.usage.password=ENC(encrypted_password_from_above) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea4142bd/docs/en-US/increase-management-server-max-memory.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/increase-management-server-max-memory.xml b/docs/en-US/increase-management-server-max-memory.xml index 51c8724..8992ad6 100644 --- a/docs/en-US/increase-management-server-max-memory.xml +++ b/docs/en-US/increase-management-server-max-memory.xml @@ -26,7 +26,7 @@ Increase Management Server Maximum Memory If the Management Server is subject to high demand, the default maximum JVM memory allocation can be insufficient. To increase the memory: - Edit the Tomcat configuration file:/etc/cloud/management/tomcat6.conf + Edit the Tomcat configuration file:/etc/cloudstack/management/tomcat6.conf Change the command-line parameter -XmxNNNm to a higher value of N.For example, if the current value is -Xmx128m, change it to -Xmx1024m or higher. To put the new setting into effect, restart the Management Server.# service cloudstack-management restart