From 23838f72f0dd5d4119dacf9f8b07c90562827647 Mon Sep 17 00:00:00 2001 Message-Id: <23838f72f0dd5d4119dacf9f8b07c90562827647.1321626769.git.hahn@univention.de> In-Reply-To: References: From: Philipp Hahn Date: Fri, 18 Nov 2011 15:30:22 +0100 Subject: [PATCH 2/5] Bug #18002: logrotate cleanup Organization: Univention GmbH, Bremen, Germany Print closing brace in python part for consistency. --- .../etc/logrotate.d/univention-maintenance | 3 +-- .../logrotate.d/univention-server-password-change | 4 +--- .../etc/logrotate.d/univention-system-setup | 3 +-- .../etc/logrotate.d/univention-spamassassin | 4 +--- .../etc/logrotate.d/univention-directory-listener | 3 --- .../etc/logrotate.d/univention-directory-logger | 3 +-- .../etc/logrotate.d/univention-directory-policy | 3 +-- .../logrotate.d/univention-directory-replication | 4 +--- .../etc/logrotate.d/univention-directory-reports | 3 +-- .../etc/logrotate.d/univention-management-console | 3 +-- .../logrotate.d/univention-log-collector-client | 3 +-- .../logrotate.d/univention-log-collector-server | 3 +-- .../conffiles/etc/logrotate.d/univention-pkgdb | 3 +-- 13 files changed, 12 insertions(+), 30 deletions(-) diff --git a/branches/ucs-3.0/ucs/base/univention-maintenance/conffiles/etc/logrotate.d/univention-maintenance b/branches/ucs-3.0/ucs/base/univention-maintenance/conffiles/etc/logrotate.d/univention-maintenance index 49762d8..c3bbe1f 100644 --- a/branches/ucs-3.0/ucs/base/univention-maintenance/conffiles/etc/logrotate.d/univention-maintenance +++ b/branches/ucs-3.0/ucs/base/univention-maintenance/conffiles/etc/logrotate.d/univention-maintenance @@ -7,8 +7,7 @@ name = "system-stats" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-server-password-change b/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-server-password-change index 8125094..4c9a015 100644 --- a/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-server-password-change +++ b/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-server-password-change @@ -7,9 +7,7 @@ name = "server_password_change" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} - diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/conffiles/etc/logrotate.d/univention-system-setup b/branches/ucs-3.0/ucs/base/univention-system-setup/conffiles/etc/logrotate.d/univention-system-setup index ae18d10..e3b6f16 100644 --- a/branches/ucs-3.0/ucs/base/univention-system-setup/conffiles/etc/logrotate.d/univention-system-setup +++ b/branches/ucs-3.0/ucs/base/univention-system-setup/conffiles/etc/logrotate.d/univention-system-setup @@ -7,8 +7,7 @@ name = "setup" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/mail/univention-spamassassin/conffiles/etc/logrotate.d/univention-spamassassin b/branches/ucs-3.0/ucs/mail/univention-spamassassin/conffiles/etc/logrotate.d/univention-spamassassin index 5adefb9..5751392 100644 --- a/branches/ucs-3.0/ucs/mail/univention-spamassassin/conffiles/etc/logrotate.d/univention-spamassassin +++ b/branches/ucs-3.0/ucs/mail/univention-spamassassin/conffiles/etc/logrotate.d/univention-spamassassin @@ -7,9 +7,7 @@ name = "spamassassin-learn" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} - diff --git a/branches/ucs-3.0/ucs/management/univention-directory-listener/conffiles/etc/logrotate.d/univention-directory-listener b/branches/ucs-3.0/ucs/management/univention-directory-listener/conffiles/etc/logrotate.d/univention-directory-listener index ea635ed..b1e4914 100644 --- a/branches/ucs-3.0/ucs/management/univention-directory-listener/conffiles/etc/logrotate.d/univention-directory-listener +++ b/branches/ucs-3.0/ucs/management/univention-directory-listener/conffiles/etc/logrotate.d/univention-directory-listener @@ -7,13 +7,10 @@ name = "listener" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] @!@ - lastaction test -x /usr/bin/sv && test -e /etc/runit/univention/univention-directory-listener && sv term univention-directory-listener || true endscript } - diff --git a/branches/ucs-3.0/ucs/management/univention-directory-logger/conffiles/etc/logrotate.d/univention-directory-logger b/branches/ucs-3.0/ucs/management/univention-directory-logger/conffiles/etc/logrotate.d/univention-directory-logger index 50e57d9..c934451 100644 --- a/branches/ucs-3.0/ucs/management/univention-directory-logger/conffiles/etc/logrotate.d/univention-directory-logger +++ b/branches/ucs-3.0/ucs/management/univention-directory-logger/conffiles/etc/logrotate.d/univention-directory-logger @@ -7,8 +7,7 @@ name = "directory-logger" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/management/univention-directory-policy/conffiles/etc/logrotate.d/univention-directory-policy b/branches/ucs-3.0/ucs/management/univention-directory-policy/conffiles/etc/logrotate.d/univention-directory-policy index a2e13d4..f6d8ac6 100644 --- a/branches/ucs-3.0/ucs/management/univention-directory-policy/conffiles/etc/logrotate.d/univention-directory-policy +++ b/branches/ucs-3.0/ucs/management/univention-directory-policy/conffiles/etc/logrotate.d/univention-directory-policy @@ -7,8 +7,7 @@ name = "ldap-policy" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/management/univention-directory-replication/conffiles/etc/logrotate.d/univention-directory-replication b/branches/ucs-3.0/ucs/management/univention-directory-replication/conffiles/etc/logrotate.d/univention-directory-replication index 5b14a24..4c61e23 100644 --- a/branches/ucs-3.0/ucs/management/univention-directory-replication/conffiles/etc/logrotate.d/univention-directory-replication +++ b/branches/ucs-3.0/ucs/management/univention-directory-replication/conffiles/etc/logrotate.d/univention-directory-replication @@ -7,9 +7,7 @@ name = "ldap-replication-resync" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} - diff --git a/branches/ucs-3.0/ucs/management/univention-directory-reports/conffiles/etc/logrotate.d/univention-directory-reports b/branches/ucs-3.0/ucs/management/univention-directory-reports/conffiles/etc/logrotate.d/univention-directory-reports index 92505d6..5fe3bf5 100644 --- a/branches/ucs-3.0/ucs/management/univention-directory-reports/conffiles/etc/logrotate.d/univention-directory-reports +++ b/branches/ucs-3.0/ucs/management/univention-directory-reports/conffiles/etc/logrotate.d/univention-directory-reports @@ -7,8 +7,7 @@ name = "directory-reports" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/management/univention-management-console/conffiles/etc/logrotate.d/univention-management-console b/branches/ucs-3.0/ucs/management/univention-management-console/conffiles/etc/logrotate.d/univention-management-console index c728cd5..e8b104c 100644 --- a/branches/ucs-3.0/ucs/management/univention-management-console/conffiles/etc/logrotate.d/univention-management-console +++ b/branches/ucs-3.0/ucs/management/univention-management-console/conffiles/etc/logrotate.d/univention-management-console @@ -7,8 +7,7 @@ name = "management-console-*" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-client b/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-client index 8e124a9..8c6613e 100644 --- a/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-client +++ b/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-client @@ -7,8 +7,7 @@ name = "log-collector-client" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-server b/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-server index e208be6..2060a0c 100644 --- a/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-server +++ b/branches/ucs-3.0/ucs/services/univention-log-collector/conffiles/etc/logrotate.d/univention-log-collector-server @@ -7,8 +7,7 @@ name = "log-collector-server" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} diff --git a/branches/ucs-3.0/ucs/services/univention-pkgdb/conffiles/etc/logrotate.d/univention-pkgdb b/branches/ucs-3.0/ucs/services/univention-pkgdb/conffiles/etc/logrotate.d/univention-pkgdb index f144861..96f5a94 100644 --- a/branches/ucs-3.0/ucs/services/univention-pkgdb/conffiles/etc/logrotate.d/univention-pkgdb +++ b/branches/ucs-3.0/ucs/services/univention-pkgdb/conffiles/etc/logrotate.d/univention-pkgdb @@ -7,8 +7,7 @@ name = "pkgdb" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} -- 1.7.1