[libvirt] [PATCH] drop the -logrotate.conf from /etc/logrotate.d/ovirt-logrotate.conf
by Dan Kenigsberg
No Fedora package uses .conf in that directory; furthermore, rpmlint
protests about it: the file name should match the name of the containing
rpm. Let us conform.
---
logrotate/ovirt-logrotate | 2 +-
ovirt-node.spec.in | 4 ++--
scripts/ovirt-config-logging | 2 +-
scripts/ovirt-functions | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/logrotate/ovirt-logrotate b/logrotate/ovirt-logrotate
index a61af6f..ad32951 100644
--- a/logrotate/ovirt-logrotate
+++ b/logrotate/ovirt-logrotate
@@ -1,3 +1,3 @@
# Run each log rotation every 10 minutes
-*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-logrotate.conf
+*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-node-stateless
*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/syslog
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 3a8266e..20fea25 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -180,7 +180,7 @@ cd -
%{__install} -p -m0755 kinit/ovirt-kinit %{buildroot}%{_sysconfdir}/cron.hourly
%{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d
-%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d
+%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node-stateless
echo "oVirt Node release %{version}-%{release}" > %{buildroot}%{_sysconfdir}/ovirt-release
mkdir -p %{buildroot}/%{_sysconfdir}/default
@@ -310,7 +310,7 @@ fi
%{_initrddir}/ovirt
%{_initrddir}/ovirt-post
%config %{_sysconfdir}/cron.hourly/ovirt-kinit
-%config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf
+%config %{_sysconfdir}/logrotate.d/ovirt-node-stateless
%config %{_sysconfdir}/cron.d/ovirt-logrotate
%{_sysconfdir}/ovirt-config-boot.d
%{_sysconfdir}/ovirt-config-setup.d
diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging
index 464dfcb..de238b7 100755
--- a/scripts/ovirt-config-logging
+++ b/scripts/ovirt-config-logging
@@ -158,7 +158,7 @@ function prompt_user {
$syslog_server_protocol
fi
sed -c -i -e "s/^size=.*/size=${max_log_size}k/" \
- /etc/logrotate.d/ovirt-logrotate.conf
+ /etc/logrotate.d/ovirt-node-stateless
return
;;
1)
diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions
index 98e88e7..7e84415 100644
--- a/scripts/ovirt-functions
+++ b/scripts/ovirt-functions
@@ -28,7 +28,7 @@ OVIRT_CONFIG_FILES="\
/etc/default/ovirt \
/etc/sysconfig/network \
/etc/collectd.conf \
- /etc/logrotate.d/ovirt-logrotate.conf
+ /etc/logrotate.d/ovirt-node-stateless
"
# Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr
--
1.6.2.5
15 years, 1 month
- 2
- 2