From b455dbbc89d79fa3a3831c7ba086e2894d31a10a Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Philipp Hahn Date: Fri, 18 Nov 2011 15:23:02 +0100 Subject: [PATCH 4/5] Bug #22011: ucs createLogfiel from lib Organization: Univention GmbH, Bremen, Germany Use the common implementation from shell-univention-lib. --- .../ucs/base/univention-server/managed-client | 7 ++----- .../ucs/base/univention-server/mobile-client | 7 ++----- .../base/univention-server/server_password_change | 9 ++------- .../ucs-3.0/ucs/base/univention-ssl/debian/control | 1 + .../univention-ssl/debian/univention-ssl.postinst | 7 ++----- .../debian/univention-dhcp.postinst | 7 ++----- .../debian/univention-pkgdb.postinst | 6 +----- 7 files changed, 12 insertions(+), 32 deletions(-) diff --git a/branches/ucs-3.0/ucs/base/univention-server/managed-client b/branches/ucs-3.0/ucs/base/univention-server/managed-client index 90d5c4c..d1da42f 100755 --- a/branches/ucs-3.0/ucs/base/univention-server/managed-client +++ b/branches/ucs-3.0/ucs/base/univention-server/managed-client @@ -30,11 +30,8 @@ # /usr/share/common-licenses/AGPL-3; if not, see # . -if [ ! -e /var/log/univention/managed-client.log ] ; then - touch /var/log/univention/managed-client.log - chown root:adm /var/log/univention/managed-client.log - chmod 640 /var/log/univention/managed-client.log -fi +. /usr/share/univention-lib/base.sh +create_logfile_if_missing /var/log/univention/managed-client.log "root:adm" 640 case $1 in start) diff --git a/branches/ucs-3.0/ucs/base/univention-server/mobile-client b/branches/ucs-3.0/ucs/base/univention-server/mobile-client index f0899de..8990402 100755 --- a/branches/ucs-3.0/ucs/base/univention-server/mobile-client +++ b/branches/ucs-3.0/ucs/base/univention-server/mobile-client @@ -30,11 +30,8 @@ # /usr/share/common-licenses/AGPL-3; if not, see # . -if [ ! -e /var/log/univention/mobile-client.log ] ; then - touch /var/log/univention/mobile-client.log - chown root:adm /var/log/univention/mobile-client.log - chmod 640 /var/log/univention/mobile-client.log -fi +. /usr/share/univention-lib/base.sh +create_logfile_if_missing /var/log/univention/mobile-client.log "root:adm" 640 case $1 in start) diff --git a/branches/ucs-3.0/ucs/base/univention-server/server_password_change b/branches/ucs-3.0/ucs/base/univention-server/server_password_change index da03f9b..beef51c 100755 --- a/branches/ucs-3.0/ucs/base/univention-server/server_password_change +++ b/branches/ucs-3.0/ucs/base/univention-server/server_password_change @@ -30,11 +30,8 @@ # /usr/share/common-licenses/AGPL-3; if not, see # . -if [ ! -e /var/log/univention/server_password_change.log ] ; then - touch /var/log/univention/server_password_change.log - chown root:adm /var/log/univention/server_password_change.log - chmod 640 /var/log/univention/server_password_change.log -fi +. /usr/share/univention-lib/all.sh +create_logfile_if_missing /var/log/univention/server_password_change.log "root:adm" 640 exec 3>>/var/log/univention/server_password_change.log echo "Starting server password change ($(date))" >&3 @@ -46,8 +43,6 @@ FAIL () { # log error message to log file and std-err, then fail eval "$(/usr/sbin/univention-config-registry shell)" -. /usr/share/univention-lib/all.sh - # 0 -> set to true # 1 -> set to false # 2 -> empty diff --git a/branches/ucs-3.0/ucs/base/univention-ssl/debian/control b/branches/ucs-3.0/ucs/base/univention-ssl/debian/control index 8dc8d2c..13e1de4 100644 --- a/branches/ucs-3.0/ucs/base/univention-ssl/debian/control +++ b/branches/ucs-3.0/ucs/base/univention-ssl/debian/control @@ -15,6 +15,7 @@ Depends: ${misc:Depends}, makepasswd, univention-directory-listener, openssl-blacklist, + shell-univention-lib (>= 1.0.25-1), python-univention-lib (>= 1.0.25-1) Description: UCS - SSL/TLS certificates This packages can create a root CA certificate to be used diff --git a/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst b/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst index 28c5e68..b561d77 100755 --- a/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst +++ b/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst @@ -64,11 +64,8 @@ univention-config-registry set ssl/country?"${country:-DE}" \ eval "$(univention-config-registry shell)" -if [ ! -e "/var/log/univention/ssl-sync.log" ]; then - touch /var/log/univention/ssl-sync.log - chown root:adm /var/log/univention/ssl-sync.log - chmod 640 /var/log/univention/ssl-sync.log -fi +. /usr/share/univention-lib/base.sh +create_logfile_if_missing /var/log/univention/ssl-sync.log "root:adm" 640 if [ "$server_role" = "domaincontroller_master" ] || [ -z "$server_role" ] || [ "$server_role" = "basesystem" ]; then if [ ! -s $CERTPATH/00.pem ] && [ ! -e "/etc/univention/ssl/$hostname.$domainname" ]; then diff --git a/branches/ucs-3.0/ucs/services/univention-dhcp/debian/univention-dhcp.postinst b/branches/ucs-3.0/ucs/services/univention-dhcp/debian/univention-dhcp.postinst index 4bd375d..8c3b788 100644 --- a/branches/ucs-3.0/ucs/services/univention-dhcp/debian/univention-dhcp.postinst +++ b/branches/ucs-3.0/ucs/services/univention-dhcp/debian/univention-dhcp.postinst @@ -34,11 +34,8 @@ set -e #DEBHELPER# -if [ ! -e /var/log/univention/dhcp.log ] ; then - touch /var/log/univention/dhcp.log - chown root:adm /var/log/univention/dhcp.log - chmod 640 /var/log/univention/dhcp.log -fi +. /usr/share/univention-lib/base.sh +create_logfile_if_missing /var/log/univention/dhcp.log "root:adm" 640 update-rc.d -f isc-dhcp-server remove >/dev/null 2>&1 update-rc.d -f dhcp3-server remove >/dev/null 2>&1 diff --git a/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst b/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst index d56c9d3..025ad10 100644 --- a/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst +++ b/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst @@ -65,11 +65,7 @@ then /etc/init.d/univention-directory-listener crestart fi - if [ ! -e /var/log/univention/pkgdb.log ]; then - touch /var/log/univention/pkgdb.log - chown root:adm /var/log/univention/pkgdb.log - chmod 640 /var/log/univention/pkgdb.log - fi + create_logfile_if_missing /var/log/univention/pkgdb.log "root:adm" 640 if [ -x "/etc/init.d/univention-management-console-server" ] ; then /etc/init.d/univention-management-console-server crestart || true -- 1.7.1