You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/02/12 16:25:52 UTC
git commit: refs/heads/master - Don't forget the
environment.properties when packaging (cherry picked from commit
5594b1d622adb07203d4549aee426268ecee092d)
Updated Branches:
refs/heads/master 98c0a4fb9 -> 28622b5e6
Don't forget the environment.properties when packaging
(cherry picked from commit 5594b1d622adb07203d4549aee426268ecee092d)
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/28622b5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/28622b5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/28622b5e
Branch: refs/heads/master
Commit: 28622b5e6f2eee48e237cd949ddf431472399d3a
Parents: 98c0a4f
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 12 16:16:36 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 12 16:20:15 2013 +0100
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 3 ++-
packaging/centos63/replace.properties | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/28622b5e/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index d814321..2577cd0 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -222,7 +222,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 ; do
+ catalina.policy catalina.properties db-enc.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
@@ -336,6 +336,7 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/management/server-ssl.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat-users.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
+%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
%attr(0755,root,root) %{_initrddir}/%{name}-management
%attr(0755,root,root) %{_bindir}/%{name}-setup-management
%attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/28622b5e/packaging/centos63/replace.properties
----------------------------------------------------------------------
diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties
index bcc4d4a..211cc95 100644
--- a/packaging/centos63/replace.properties
+++ b/packaging/centos63/replace.properties
@@ -21,7 +21,6 @@ DBROOTPW=
MSLOG=vmops.log
APISERVERLOG=api.log
DBHOST=localhost
-MSMNTDIR=/mnt
COMPONENTS-SPEC=components-premium.xml
AWSAPILOG=awsapi.log
REMOTEHOST=localhost
@@ -45,7 +44,7 @@ MSCONF=/etc/cloudstack/management
MSENVIRON=/usr/share/cloudstack-management
MSLOG=/var/log/cloudstack/management/management-server.log
MSLOGDIR=/var/log/cloudstack/management/
-MSMNTDIR=/var/lib/cloud/mnt
+MSMNTDIR=/var/cloudstack/mnt
MSUSER=cloud
PIDDIR=/var/run
PLUGINJAVADIR=/usr/share/cloudstack-management/plugin