diff --git a/openstack/monasca-api/api-wsgi.conf b/openstack/monasca-api/api-wsgi.conf index 30efe1a2f..fa151041a 100644 --- a/openstack/monasca-api/api-wsgi.conf +++ b/openstack/monasca-api/api-wsgi.conf @@ -9,8 +9,8 @@ Listen 8070 WSGIPassAuthorization On LogLevel info - ErrorLog /var/log/__APACHE_NAME__/monasca-api.log - CustomLog /var/log/__APACHE_NAME__/monasca-api_access.log combined + ErrorLog /var/log/monasca-api/monasca-api.log + CustomLog /var/log/monasca-api/monasca-api_access.log combined SetEnv no-gzip 1 AddDefaultCharset utf-8 diff --git a/openstack/monasca-api/monasca-api.spec.j2 b/openstack/monasca-api/monasca-api.spec.j2 index 05cecdcdc..ba38e3f4c 100644 --- a/openstack/monasca-api/monasca-api.spec.j2 +++ b/openstack/monasca-api/monasca-api.spec.j2 @@ -122,9 +122,6 @@ and managing monitoring related resources. ## install apache configuration %{__install} -p -D -m 640 %{SOURCE4} %{buildroot}%{apache_site_dir}/%{component}.conf.sample -sed -e " - s|__APACHE_NAME__|%{apache_name}|g; -" -i %{buildroot}%{apache_site_dir}/%{component}.conf.sample ## install WSGIScriptAlias %{__install} -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/monasca-api-wsgi.py @@ -155,7 +152,7 @@ fi %dir %attr(-, root, monasca) %{_sysconfdir}/monasca %dir %attr(0750, monasca-api, monasca) %{_var}/lib/%{component} -%dir %attr(-, root, monasca) %{_var}/log/%{component} +%dir %attr(0750, monasca-api, monasca) %{_var}/log/%{component} %config(noreplace) %attr(0640, root, monasca) %{_sysconfdir}/monasca/api-config.conf %config(noreplace) %attr(0640, root, monasca) %{_sysconfdir}/monasca/api-logging.conf