Attachment 7005 Details for Bug 38837 – patch

[patch] patch

38837.patch (text/plain), 3.63 KB, created by Florian Best on 2015-07-07 09:24:42 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2015-07-07 09:24:42 CEST

Size: 3.63 KB

patch

obsolete

>diff --git a/ucs-4.0-2/base/univention-welcome-screen/conffiles/etc/logrotate.d/univention-welcome-screen b/ucs-4.0-2/base/univention-welcome-screen/conffiles/etc/logrotate.d/univention-welcome-screen
>new file mode 100644
>index 0000000..4cf4da5
>--- /dev/null
>+++ b/ucs-4.0-2/base/univention-welcome-screen/conffiles/etc/logrotate.d/univention-welcome-screen
>@@ -0,0 +1,12 @@
>+@%@UCRWARNING=# @%@
>+
>+@!@
>+import univention.lib.ucrLogrotate
>+
>+settings = univention.lib.ucrLogrotate.getLogrotateConfig("welcome-screen", configRegistry)
>+
>+print "/var/log/univention/welcome-screen.log {"
>+for setting in settings.values():
>+	print "\t%s" % setting
>+print "}"
>+@!@
>diff --git a/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.init b/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.init
>index da439a8..cec8d4a 100644
>--- a/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.init
>+++ b/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.init
>@@ -48,7 +48,7 @@ case "$1" in
> 				exit 0
> 			fi
> 		fi
>-		/usr/bin/univention-welcome-screen > "/var/log/univention/welcome-screen.log" 2>&1 &
>+		/usr/bin/univention-welcome-screen >> "/var/log/univention/welcome-screen.log" 2>&1 &
> 		log_action_end_msg 0
> 		;;
> 	stop)
>diff --git a/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.postinst b/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.postinst
>new file mode 100644
>index 0000000..70f0458
>--- /dev/null
>+++ b/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.postinst
>@@ -0,0 +1,39 @@
>+#!/bin/sh
>+#
>+# Univention Welcome Screen
>+#  postinst script for the debian package
>+#
>+# Copyright 2015 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# The source code of this program is made available
>+# under the terms of the GNU Affero General Public License version 3
>+# (GNU AGPL V3) as published by the Free Software Foundation.
>+#
>+# Binary versions of this program provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention and not subject to the GNU AGPL V3.
>+#
>+# In the case you use this program under the terms of the GNU AGPL V3,
>+# the program is provided in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU Affero General Public License for more details.
>+#
>+# You should have received a copy of the GNU Affero General Public
>+# License with the Debian GNU/Linux or Univention distribution in file
>+# /usr/share/common-licenses/AGPL-3; if not, see
>+# <http://www.gnu.org/licenses/>.
>+
>+. /usr/share/univention-lib/all.sh
>+
>+#DEBHELPER#
>+
>+create_logfile /var/log/univention/welcome-screen.log "root:adm" 640
>+
>+exit 0
>diff --git a/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.univention-config-registry b/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.univention-config-registry
>index 431eece..d177d3d 100644
>--- a/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.univention-config-registry
>+++ b/ucs-4.0-2/base/univention-welcome-screen/debian/univention-welcome-screen.univention-config-registry
>@@ -5,3 +5,7 @@ Variables: server/role
> Variables: hostname
> Variables: domainname
> Variables: umc/web/appliance/.*
>+
>+Type: file
>+File: etc/logrotate.d/univention-welcome-screen
>+Variables: logrotate/.*

Actions: View | Diff

Attachments on bug 38837: 7005