From c28547c7f651f01462c228d8c9ec5b3b3c07e9d6 Mon Sep 17 00:00:00 2001 Message-Id: From: Philipp Hahn Date: Fri, 18 Nov 2011 15:15:52 +0100 Subject: [PATCH 1/5] Bug #18002: Fix logrotate templates Organization: Univention GmbH, Bremen, Germany 1. Join consecutive @!@ template sections, since each one forks it's own python interpreter. 2. Fix one missing @!@. 3. Add "shared" to UVMM, since the pattern matches two files, which would restart UVMMd two times. 4. Remove unused univention-printserver. 5. Add missing errata-updates.log 6. Add missing dpkg-divert.log 7. Fix wrong path for ../heimdal-kdc.log 8. Add missing check_connection.log --- .../logrotate.d/univention-config-registry-replog | 13 ++++++++- .../conffiles/etc/logrotate.d/heimdal-kdc | 6 +--- .../etc/logrotate.d/univention-managed-client | 11 ++++++- .../etc/logrotate.d/univention-mobile-client | 10 ++++++- .../conffiles/etc/logrotate.d/univention-ssl | 13 ++------- .../conffiles/etc/logrotate.d/univention-updater | 28 ++++++++----------- .../etc/logrotate.d/univention-directory-manager | 21 +++------------ .../conffiles/etc/logrotate.d/univention-join | 15 ++-------- .../etc/logrotate.d/univention-ad-connector | 21 +++------------ .../etc/logrotate.d/univention-printserver | 14 ---------- .../etc/logrotate.d/univention-s4-connector | 14 ++-------- .../conffiles/etc/logrotate.d/univention-samba | 12 +------- .../conffiles/etc/logrotate.d/univention-samba4 | 10 +----- .../univention-virtual-machine-manager-daemon | 2 +- 14 files changed, 65 insertions(+), 125 deletions(-) delete mode 100644 branches/ucs-3.0/ucs/services/univention-printserver/conffiles/etc/logrotate.d/univention-printserver diff --git a/branches/ucs-3.0/ucs/base/univention-base-files/conffiles/etc/logrotate.d/univention-config-registry-replog b/branches/ucs-3.0/ucs/base/univention-base-files/conffiles/etc/logrotate.d/univention-config-registry-replog index 587fbd3..b94cfaa 100644 --- a/branches/ucs-3.0/ucs/base/univention-base-files/conffiles/etc/logrotate.d/univention-config-registry-replog +++ b/branches/ucs-3.0/ucs/base/univention-base-files/conffiles/etc/logrotate.d/univention-config-registry-replog @@ -1,13 +1,22 @@ @%@UCRWARNING=# @%@ -/var/log/univention/config-registry.replog { @!@ import univention.lib.ucrLogrotate name = "ucr-replog" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) +print "/var/log/univention/config-registry.replog {" for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" + + +name = "dpkg-divert" +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-heimdal/conffiles/etc/logrotate.d/heimdal-kdc b/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/logrotate.d/heimdal-kdc index ff742d7..4ae4288 100644 --- a/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/logrotate.d/heimdal-kdc +++ b/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/logrotate.d/heimdal-kdc @@ -6,10 +6,8 @@ import univention.lib.ucrLogrotate name = "heimdal-kdc" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) -print "/var/log/univention/%s.log {" % name - +print "/var/log/%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-managed-client b/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-managed-client index 9f650fa..5465803 100644 --- a/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-managed-client +++ b/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-managed-client @@ -7,9 +7,16 @@ name = "managed-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 "}" + +name = "check_connection" +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-mobile-client b/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-mobile-client index 4fcbff2..d15a517 100644 --- a/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-mobile-client +++ b/branches/ucs-3.0/ucs/base/univention-server/conffiles/etc/logrotate.d/univention-mobile-client @@ -7,8 +7,16 @@ name = "mobile-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 "}" + +name = "check_connection" +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-ssl/conffiles/etc/logrotate.d/univention-ssl b/branches/ucs-3.0/ucs/base/univention-ssl/conffiles/etc/logrotate.d/univention-ssl index 655007d..b56e90b 100644 --- a/branches/ucs-3.0/ucs/base/univention-ssl/conffiles/etc/logrotate.d/univention-ssl +++ b/branches/ucs-3.0/ucs/base/univention-ssl/conffiles/etc/logrotate.d/univention-ssl @@ -1,23 +1,16 @@ @%@UCRWARNING=# @%@ @!@ - -libAvailable = True - try: import univention.lib.ucrLogrotate -except: - libAvailable = False - -if libAvailable: - +except ImportError: + pass +else: name = "ssl-sync" 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-updater/conffiles/etc/logrotate.d/univention-updater b/branches/ucs-3.0/ucs/base/univention-updater/conffiles/etc/logrotate.d/univention-updater index 2ba1c5c..9d2b709 100644 --- a/branches/ucs-3.0/ucs/base/univention-updater/conffiles/etc/logrotate.d/univention-updater +++ b/branches/ucs-3.0/ucs/base/univention-updater/conffiles/etc/logrotate.d/univention-updater @@ -7,47 +7,43 @@ name = "updater" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "actualise" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "repository" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "security-updates" 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 "}" + +name = "errata-updates" +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-manager-modules/conffiles/etc/logrotate.d/univention-directory-manager b/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/conffiles/etc/logrotate.d/univention-directory-manager index 2fa9afe..12bee0b 100644 --- a/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/conffiles/etc/logrotate.d/univention-directory-manager +++ b/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/conffiles/etc/logrotate.d/univention-directory-manager @@ -7,47 +7,34 @@ name = "sync-memberuid" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "check_group_recursion" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "directory-manager-cmd" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "admin-cmd" 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-join/conffiles/etc/logrotate.d/univention-join b/branches/ucs-3.0/ucs/management/univention-join/conffiles/etc/logrotate.d/univention-join index 5bb74e2..36f188d 100644 --- a/branches/ucs-3.0/ucs/management/univention-join/conffiles/etc/logrotate.d/univention-join +++ b/branches/ucs-3.0/ucs/management/univention-join/conffiles/etc/logrotate.d/univention-join @@ -7,34 +7,25 @@ name = "join" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "check_join_status" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "server-join" 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-ad-connector/conffiles/etc/logrotate.d/univention-ad-connector b/branches/ucs-3.0/ucs/services/univention-ad-connector/conffiles/etc/logrotate.d/univention-ad-connector index cd1eef5..3c8b740 100644 --- a/branches/ucs-3.0/ucs/services/univention-ad-connector/conffiles/etc/logrotate.d/univention-ad-connector +++ b/branches/ucs-3.0/ucs/services/univention-ad-connector/conffiles/etc/logrotate.d/univention-ad-connector @@ -7,47 +7,34 @@ name = "connector-tracebacks" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "ad-connector-certificate" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "connector-status" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "connector" 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-printserver/conffiles/etc/logrotate.d/univention-printserver b/branches/ucs-3.0/ucs/services/univention-printserver/conffiles/etc/logrotate.d/univention-printserver deleted file mode 100644 index 1d4f871..0000000 --- a/branches/ucs-3.0/ucs/services/univention-printserver/conffiles/etc/logrotate.d/univention-printserver +++ /dev/null @@ -1,14 +0,0 @@ -@%@UCRWARNING=# @%@ - -@!@ -import univention.lib.ucrLogrotate - -name = "printserver-start" -settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) - -print "/var/log/univention/%s.log {" % name - -for setting in settings.keys(): - print "\t%s" % settings[setting] -@!@ -} diff --git a/branches/ucs-3.0/ucs/services/univention-s4-connector/conffiles/etc/logrotate.d/univention-s4-connector b/branches/ucs-3.0/ucs/services/univention-s4-connector/conffiles/etc/logrotate.d/univention-s4-connector index 6565107..b28306f 100644 --- a/branches/ucs-3.0/ucs/services/univention-s4-connector/conffiles/etc/logrotate.d/univention-s4-connector +++ b/branches/ucs-3.0/ucs/services/univention-s4-connector/conffiles/etc/logrotate.d/univention-s4-connector @@ -7,33 +7,25 @@ name = "connector-tracebacks" 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 "}" -@!@ -import univention.lib.ucrLogrotate name = "*-s4.log" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] -@!@ -} +print "}" name = "*-s4-status.log" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] +print "}" @!@ -} - diff --git a/branches/ucs-3.0/ucs/services/univention-samba/conffiles/etc/logrotate.d/univention-samba b/branches/ucs-3.0/ucs/services/univention-samba/conffiles/etc/logrotate.d/univention-samba index b9f6fb1..d34fe7d 100644 --- a/branches/ucs-3.0/ucs/services/univention-samba/conffiles/etc/logrotate.d/univention-samba +++ b/branches/ucs-3.0/ucs/services/univention-samba/conffiles/etc/logrotate.d/univention-samba @@ -7,23 +7,15 @@ name = "samba-sync" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] -@!@ -} - -@!@ -import univention.lib.ucrLogrotate +print "}" name = "pdc-takeover" 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-samba4/conffiles/etc/logrotate.d/univention-samba4 b/branches/ucs-3.0/ucs/services/univention-samba4/conffiles/etc/logrotate.d/univention-samba4 index ba40979..12cfad5 100644 --- a/branches/ucs-3.0/ucs/services/univention-samba4/conffiles/etc/logrotate.d/univention-samba4 +++ b/branches/ucs-3.0/ucs/services/univention-samba4/conffiles/etc/logrotate.d/univention-samba4 @@ -7,21 +7,15 @@ name = "sysvol-sync" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s.log {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] -@!@ -} - -@!@ -import univention.lib.ucrLogrotate +print "}" name = "samba4-provision" 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/virtualization/univention-virtual-machine-manager-daemon/conffiles/etc/logrotate.d/univention-virtual-machine-manager-daemon b/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/conffiles/etc/logrotate.d/univention-virtual-machine-manager-daemon index 9df6366..6f7f9b0 100644 --- a/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/conffiles/etc/logrotate.d/univention-virtual-machine-manager-daemon +++ b/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/conffiles/etc/logrotate.d/univention-virtual-machine-manager-daemon @@ -7,11 +7,11 @@ name = "virtual-machine-manager-daemon*.log" settings = univention.lib.ucrLogrotate.getLogrotateConfig(name, configRegistry) print "/var/log/univention/%s {" % name - for setting in settings.keys(): print "\t%s" % settings[setting] @!@ delaycompress + sharedscripts postrotate if [ -e /etc/runit/univention-virtual-machine-manager-daemon/supervise/pid ] then -- 1.7.1