Summary: update packaging

spark404 · spark404 · commit 2234e043e2c9 · 2013-02-05T10:47:42.000+01:00
Change some paths to use the new cloudstack name
diff --git a/client/bindir/cloud-setup-management.in b/client/bindir/cloud-setup-management.in
@@ -24,7 +24,7 @@ from cloudutils.globalEnv import globalEnv
 from cloudutils.serviceConfigServer import cloudManagementConfig
 from optparse import OptionParser
 if __name__ == '__main__':
-    initLoging("/var/log/cloud/setupManagement.log")
+    initLoging("@MSLOGDIR@/setupManagement.log")
     glbEnv = globalEnv()
     
     parser = OptionParser()
diff --git a/packaging/centos63/cloud-management.sysconfig b/packaging/centos63/cloud-management.sysconfig
@@ -18,6 +18,6 @@
 # This file is loaded in /etc/init.d/vmopsmanagement
 # ATM we only do two things here:
 
-dummy=1 ; export TOMCAT_CFG=/etc/cloud/management/tomcat6.conf ; . /etc/cloud/management/tomcat6.conf
+dummy=1 ; export TOMCAT_CFG=/etc/cloudstack/management/tomcat6.conf ; . /etc/cloudstack/management/tomcat6.conf
 #--------------------------
 
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
@@ -193,6 +193,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
 # Specific for tomcat
@@ -316,6 +317,7 @@ fi
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent
+%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management
 %config(noreplace) %{_sysconfdir}/%{name}/management
 %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties
@@ -43,8 +43,8 @@ LOCKDIR=/var/lock
 MSCLASSPATH=
 MSCONF=/etc/cloudstack/management
 MSENVIRON=/usr/share/cloudstack-management
-MSLOG=/var/log/cloudstack-management/management-server.log
-MSLOGDIR=/var/log/cloudstack-management/
+MSLOG=/var/log/cloudstack/management/management-server.log
+MSLOGDIR=/var/log/cloudstack/management/
 MSMNTDIR=/var/lib/cloud/mnt
 MSUSER=cloud
 PIDDIR=/var/run
