Updated Branches: refs/heads/master 0b35f7184 -> d92725e84
Summary: Packaging fixes for usage Make the usage server look in the /etc/cloudstack/usage server for the db.properties Add the /etc/cloudstack/usage to the package as an empty dir Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d92725e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d92725e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d92725e8 Branch: refs/heads/master Commit: d92725e84651650963da7a7e84dd78e0ace29603 Parents: 0b35f71 Author: Hugo Trippaers <[email protected]> Authored: Tue Feb 26 16:40:35 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Feb 26 16:40:35 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud-usage.rc | 2 +- packaging/centos63/cloud.spec | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d92725e8/packaging/centos63/cloud-usage.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc index 6eff123..bbb5d80 100755 --- a/packaging/centos63/cloud-usage.rc +++ b/packaging/centos63/cloud-usage.rc @@ -63,7 +63,7 @@ JCP="/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods -export CLASSPATH="$SCP:$DCP:$UCP:$JCP:/etc/sysconfig" +export CLASSPATH="$SCP:$DCP:$UCP:$JCP:/etc/cloudstack/usage" start() { if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d92725e8/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 74a75a3..0c5e615 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -262,6 +262,7 @@ install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventa cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib # Usage server +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib install -D usage/target/cloud-usage-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/cloud-usage-%{_maventag}.jar cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/ @@ -407,6 +408,7 @@ fi %attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar %attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar %dir /var/log/%{name}/usage +%dir %{_sysconfdir}/%{name}/usage %doc LICENSE %doc NOTICE
