diff --git a/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup b/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup deleted file mode 100755 index 9d254d3fbb4..00000000000 --- a/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# /etc/cron.daily/cloud-cleanup: cleanup old cloudstack logs -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -cd / -output=$(find /var/log/cloud -mtime +7 -size +1M -exec rm -v '{}' \; ) -logger -t cloud "cloud-cleanup cronjob: cleaning up logfiles in /var/log/cloud older than 7 days and more than 1M in size" - -[ "$output" != "" ] && logger -t cloud $output -[ -z "$output" ] && logger -t cloud "No files removed" - -exit 0 diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/config/etc/logrotate.d/cloud index 420fce23e18..3fedd5e32ec 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/cloud +++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,7 +16,6 @@ # under the License. /var/log/cloud.log { rotate 4 - daily size 10M missingok notifempty diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd index 0229cd7e8c5..1c37c4c80d5 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd +++ b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd @@ -1,5 +1,4 @@ /var/log/conntrackd-stats.log { - daily size 10M rotate 2 missingok diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq index 2f917855190..99815d856f8 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq +++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq @@ -1,5 +1,4 @@ /var/log/dnsmasq.log { - daily size 10M missingok rotate 5 diff --git a/systemvm/patches/debian/config/etc/logrotate.d/haproxy b/systemvm/patches/debian/config/etc/logrotate.d/haproxy index 858fe2a1c3a..28da41c2ede 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/haproxy +++ b/systemvm/patches/debian/config/etc/logrotate.d/haproxy @@ -1,10 +1,9 @@ /var/log/haproxy.log { - daily rotate 5 missingok notifempty size 10M - postrotate + postrotate /bin/kill -HUP `cat /var/run/rsyslog.pid 2> /dev/null` 2> /dev/null || true endscript } diff --git a/systemvm/patches/debian/config/etc/logrotate.d/ppp b/systemvm/patches/debian/config/etc/logrotate.d/ppp index 2004e77ff0f..624b4aed25e 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/ppp +++ b/systemvm/patches/debian/config/etc/logrotate.d/ppp @@ -1,5 +1,4 @@ /var/log/ppp-connect-errors { - daily size 10M rotate 5 missingok diff --git a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog index 5803c43d875..5a104b3e52b 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog +++ b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog @@ -1,7 +1,6 @@ /var/log/syslog { rotate 7 - daily size 50M missingok notifempty @@ -26,7 +25,6 @@ /var/log/messages { rotate 10 - daily size 50M missingok notifempty