Attachment 10539 Details for Bug 51294 – patch

[patch] patch

51294.patch (text/plain), 1.46 KB, created by Florian Best on 2020-10-28 21:53:57 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2020-10-28 21:53:57 CET

Size: 1.46 KB

patch

obsolete

>commit 52f6c2045591e026234fcf7de72f3bfc05db59a4
>Author: Florian Best <best@univention.de>
>Date:   Wed Oct 28 21:51:55 2020 +0100
>
>    Bug #51294: make Apache configuration possible via UCR
>
>diff --git services/univention-apache/conffiles/etc/apache2/conf-available/ucs.conf services/univention-apache/conffiles/etc/apache2/conf-available/ucs.conf
>index f8d06c4926..44ce67c6cd 100644
>--- services/univention-apache/conffiles/etc/apache2/conf-available/ucs.conf
>+++ services/univention-apache/conffiles/etc/apache2/conf-available/ucs.conf
>@@ -1,8 +1,21 @@
> @%@UCRWARNING=# @%@
> 
>-MaxClients @%@apache2/maxclients@%@
>-ServerAdmin webmaster@@%@hostname@%@.@%@domainname@%@
>-ServerSignature On
>+@!@
>+mapping = {
>+	'ServerLimit': ('apache2/server-limit', None),
>+	'StartServers': ('apache2/start-servers', None),
>+	'MaxRequestWorkers': ('apache2/maxclients', None),
>+	'MinSpareThreads': ('apache2/min-spare-threads', None),
>+	'MaxSpareThreads': ('apache2/maxs-pare-threads', None),
>+	'ThreadsPerChild': ('apache2/threads-per-child', None),
>+	'ServerSignature': ('apache2/server-signature', 'On'),
>+	'ServerTokens': ('apache2/server-tokens', None),
>+	'ServerAdmin': ('apache2/server-admin', 'webmaster@%(hostname)s.%(domainname)s' % configRegistry),
>+}
>+for key, (ucr, default) in sorted(mapping.items()):
>+	if configRegistry.get(ucr, default):
>+		print('%s %s' % (key, configRegistry.get(ucr, default)))
>+@!@
> 
> # Possible values include: debug, info, notice, warn, error, crit,
> # alert, emerg.

Actions: View | Diff

Attachments on bug 51294: 10539