Fix access to ceilometer log directory

Change-Id: I35e106afc0717a6ee9553e21113cc2f45d782dac
Related-bug: #1400240

diff --git a/debian/ceilometer-common.postinst b/debian/ceilometer-common.postinst
index 27ca0a2d42646c43ea50eb79bc25a3b1b5761963..271dd31f0839db8a54cf2e09d594e2a9a90a6450 100644 (file)
--- a/debian/ceilometer-common.postinst
+++ b/debian/ceilometer-common.postinst
@@ -9,9 +9,8 @@ if [ "$1" = "configure" ]; then
         adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer
     fi
 
-    chown -R ceilometer:adm /var/log/ceilometer
-    chmod 0750 /var/log/ceilometer
-    chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer
+    chmod 0775 /var/log/ceilometer
+    chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer /var/log/ceilometer
 
     if grep -qE "^(sql_)?connection.*sqlite.*" /etc/ceilometer/ceilometer.conf
     then

diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec
index 88bac79cd72bbebd549905d607741884c2723f1c..6b77df569fd6ef8c1894f2a5d50eaeffe2bfb8c1 100644 (file)
--- a/rpm/SPECS/openstack-ceilometer.spec
+++ b/rpm/SPECS/openstack-ceilometer.spec
@@ -365,7 +365,7 @@ oslo-config-generator --output-file etc/ceilometer/ceilometer.conf.sample \
 # Setup directories
 install -d -m 755 %{buildroot}%{_sharedstatedir}/ceilometer
 install -d -m 755 %{buildroot}%{_sharedstatedir}/ceilometer/tmp
-install -d -m 755 %{buildroot}%{_localstatedir}/log/ceilometer
+install -d -m 775 %{buildroot}%{_localstatedir}/log/ceilometer
 
 # Install config files
 install -d -m 755 %{buildroot}%{_sysconfdir}/ceilometer
@@ -690,7 +690,7 @@ fi
 %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/event_definitions.yaml
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
-%dir %attr(0755, ceilometer, root) %{_localstatedir}/log/ceilometer
+%dir %attr(0775, ceilometer, ceilometer) %{_localstatedir}/log/ceilometer
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %dir %attr(0755, ceilometer, root) %{_localstatedir}/run/ceilometer
 %endif