Attachment #7988 for bug #42196

View | Details | Raw Unified | Return to bug 42196
Collapse All | Expand All

Lines 1-3 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/changelog (+6 lines)
		1	univention-apache (9.0.1-1) unstable; urgency=low
		2
		3	* Bug #42196: Fix default configuration
		4
		5	-- Philipp Hahn <hahn@univention.de> Thu, 08 Sep 2016 10:10:19 +0200
		6
1	univention-apache (9.0.0-4) unstable; urgency=low	7	univention-apache (9.0.0-4) unstable; urgency=low
2		8
3	* Bug #42196: apache config upgrade	9	* Bug #42196: apache config upgrade





# update to 4.2-0
dpkg-maintscript-helper rm_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf -- $@
if dpkg --compare-versions "$2" lt-nl 9.0.0; then
	ucr update
	a2dismod auth_pam
fi


if [ -x /etc/init.d/apache2 ]; then
	# better stop&start, as this behaves differently to restart
	invoke-rc.d apache2 stop
	sleep 3
	invoke-rc.d apache2 start
fi

ucr set "ucs/server/languages/en_US?English" \

	"ucs/server/languages/de_AT?Deutsch (Österreich)" \
	"ucs/server/languages/de_CH?Deutsch (Schweiz)" 


exit 0

- 
--
.../debian/univention-apache.maintscript           |  1 +
.../debian/univention-apache.postinst              |  1 -
.../debian/univention-apache.postrm                |  2 --
.../debian/univention-apache.preinst               | 37 ----------------------
4 files changed, 1 insertion(+), 40 deletions(-)
create mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.maintscript
delete mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.preinst

Line 0 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.maintscript (+1 lines)
	1	mv_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf /etc/univention/templates/files/etc/apache2/conf-available/ucs.conf 9.0.1~

Lines 33-39 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.postinst (-1 lines)
33	#DEBHELPER#	33	#DEBHELPER#
34		34
35	# update to 4.2-0	35	# update to 4.2-0
36	dpkg-maintscript-helper rm_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf -- $@
37	if dpkg --compare-versions "$2" lt-nl 9.0.0; then	36	if dpkg --compare-versions "$2" lt-nl 9.0.0; then
38	ucr update	37	ucr update
39	a2dismod auth_pam	38	a2dismod auth_pam

Lines 30-37 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.postrm (-2 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
33	dpkg-maintscript-helper rm_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf -- $@
34
35	if [ "$1" = "purge" ]; then	33	if [ "$1" = "purge" ]; then
36	rm -rf /etc/univention/apache	34	rm -rf /etc/univention/apache
37	fi	35	fi




#!/bin/sh
#
# Univention Apache
#  preinst script for the debian package
#
# Copyright 2016 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/>.

#DEBHELPER#

dpkg-maintscript-helper rm_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf -- $@

exit 0
- 
--
.../univention-apache/conffiles/etc/apache2/conf-available/ucs.conf  | 5 -----
1 file changed, 5 deletions(-)




# alert, emerg.
LogLevel @%@apache2/loglevel@%@

<Directory />
	Options +FollowSymLinks
	AllowOverride None
</Directory>

<Directory "/usr/lib/cgi-bin">
	AllowOverride None
	Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
- 
--
.../univention-apache/conffiles/etc/apache2/conf-available/ucs.conf     | 2 --
.../conffiles/etc/apache2/ucs-sites.conf.d/ucs-sites.conf               | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)

Lines 4-11 MaxClients @%@apache2/maxclients@%@ Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/conf-available/ucs.conf (-2 lines)
4	ServerAdmin webmaster@@%@hostname@%@.@%@domainname@%@	4	ServerAdmin webmaster@@%@hostname@%@.@%@domainname@%@
5	ServerSignature On	5	ServerSignature On
6		6
7	CustomLog /var/log/apache2/access.log combined
8	ErrorLog /var/log/apache2/error.log
9	# Possible values include: debug, info, notice, warn, error, crit,	7	# Possible values include: debug, info, notice, warn, error, crit,
10	# alert, emerg.	8	# alert, emerg.
11	LogLevel @%@apache2/loglevel@%@	9	LogLevel @%@apache2/loglevel@%@




ProxyTimeout 600

DocumentRoot @%@apache2/documentroot@%@
CustomLog /var/log/apache2/access.log combined
@!@
print 'RedirectMatch ^/$ /%s' % baseConfig.get('apache2/startsite', 'ucs-overview')
@!@
- 
--
.../conffiles/etc/apache2/conf-available/ucs.conf                  | 7 -------
.../conffiles/etc/apache2/ucs-sites.conf.d/ucs-sites.conf          | 2 --
2 files changed, 9 deletions(-)




# alert, emerg.
LogLevel @%@apache2/loglevel@%@

<Directory "/usr/lib/cgi-bin">
	AllowOverride None
	Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
	Order allow,deny
	Allow from all
</Directory>

<Directory /var/www/>
	Options +Indexes +FollowSymLinks +MultiViews
	@!@




ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/

RewriteEngine on
RewriteOptions Inherit
ProxyPreserveHost on
- 
--
.../etc/apache2/sites-available/000-default.d/00start          |  5 +++++
.../conffiles/etc/apache2/sites-available/000-default.d/99end  |  1 +
.../conffiles/etc/apache2/sites-available/default.d/00start    |  5 -----
.../conffiles/etc/apache2/sites-available/default.d/99end      |  1 -
.../univention-apache/debian/univention-apache.maintscript     |  2 ++
.../debian/univention-apache.univention-config-registry        | 10 +++++-----
6 files changed, 13 insertions(+), 11 deletions(-)
create mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/00start
create mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/99end
delete mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/00start
delete mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/99end

Line 0 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/00start (+5 lines)
	1	@%@UCRWARNING=# @%@
	2
	3	<VirtualHost *:80>
	4	Include /etc/apache2/ucs-sites.conf.d
	5

Line 0 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/99end (+1 lines)
	1	</VirtualHost>

Lines 1-5 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/00start (-5 lines)
1	@%@UCRWARNING=# @%@
2
3	<VirtualHost *:80>
4	Include /etc/apache2/ucs-sites.conf.d
5

Line 1 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/99end (-1 lines)
1	</VirtualHost>

Line 1 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.maintscript (+2 lines)
1	mv_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf /etc/univention/templates/files/etc/apache2/conf-available/ucs.conf 9.0.1~	1	mv_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf /etc/univention/templates/files/etc/apache2/conf-available/ucs.conf 9.0.1~
		2	mv_conffile /etc/apache2/sites-available/default.d/00start /etc/apache2/sites-available/000-default.d/00start 9.0.1~
		3	mv_conffile /etc/apache2/sites-available/default.d/99end /etc/apache2/sites-available/000-default.d/99end 9.0.1~




Variables: apache2/documentroot

Type: multifile
Multifile: etc/apache2/sites-available/000-default.conf

Type: subfile
Multifile: etc/apache2/sites-available/000-default.conf
Subfile: etc/apache2/sites-available/000-default.d/00start

Type: subfile
Multifile: etc/apache2/sites-available/000-default.conf
Subfile: etc/apache2/sites-available/000-default.d/99end

Type: file
File: etc/apache2/mods-available/ssl.conf
- 

Return to bug 42196

Lines 12-26 Variables: apache2/startsite Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.univention-config-registry (-6 / +5 lines)
12	Variables: apache2/documentroot	12	Variables: apache2/documentroot
13		13
14	Type: multifile	14	Type: multifile
15	Multifile: etc/apache2/sites-available/default.conf	15	Multifile: etc/apache2/sites-available/000-default.conf
16		16
17	Type: subfile	17	Type: subfile
18	Multifile: etc/apache2/sites-available/default.conf	18	Multifile: etc/apache2/sites-available/000-default.conf
19	Subfile: etc/apache2/sites-available/default.d/00start	19	Subfile: etc/apache2/sites-available/000-default.d/00start
20		20
21	Type: subfile	21	Type: subfile
22	Multifile: etc/apache2/sites-available/default.conf	22	Multifile: etc/apache2/sites-available/000-default.conf
23	Subfile: etc/apache2/sites-available/default.d/99end	23	Subfile: etc/apache2/sites-available/000-default.d/99end
24		24
25	Type: file	25	Type: file
26	File: etc/apache2/mods-available/ssl.conf	26	File: etc/apache2/mods-available/ssl.conf
27	-

Lines 1-37 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.preinst (-39 lines)
1	#!/bin/sh
2	#
3	# Univention Apache
4	# preinst script for the debian package
5	#
6	# Copyright 2016 Univention GmbH
7	#
8	# http://www.univention.de/
9	#
10	# All rights reserved.
11	#
12	# The source code of this program is made available
13	# under the terms of the GNU Affero General Public License version 3
14	# (GNU AGPL V3) as published by the Free Software Foundation.
15	#
16	# Binary versions of this program provided by Univention to you as
17	# well as other copyrighted, protected or trademarked materials like
18	# Logos, graphics, fonts, specific documentations and configurations,
19	# cryptographic keys etc. are subject to a license agreement between
20	# you and Univention and not subject to the GNU AGPL V3.
21	#
22	# In the case you use this program under the terms of the GNU AGPL V3,
23	# the program is provided in the hope that it will be useful,
24	# but WITHOUT ANY WARRANTY; without even the implied warranty of
25	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26	# GNU Affero General Public License for more details.
27	#
28	# You should have received a copy of the GNU Affero General Public
29	# License with the Debian GNU/Linux or Univention distribution in file
30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.
32
33	#DEBHELPER#
34
35	dpkg-maintscript-helper rm_conffile /etc/univention/templates/files/etc/apache2/conf.d/ucs.conf -- $@
36
37	exit 0
38	-
39	--
40	.../univention-apache/conffiles/etc/apache2/conf-available/ucs.conf \| 5 -----	0	.../univention-apache/conffiles/etc/apache2/conf-available/ucs.conf \| 5 -----
41	1 file changed, 5 deletions(-)	1	1 file changed, 5 deletions(-)

Lines 6-11 ProxyPreserveHost on Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/ucs-sites.conf.d/ucs-sites.conf (-2 / +1 lines)
6	ProxyTimeout 600	6	ProxyTimeout 600
7		7
8	DocumentRoot @%@apache2/documentroot@%@	8	DocumentRoot @%@apache2/documentroot@%@
		9	CustomLog /var/log/apache2/access.log combined
9	@!@	10	@!@
10	print 'RedirectMatch ^/$ /%s' % baseConfig.get('apache2/startsite', 'ucs-overview')	11	print 'RedirectMatch ^/$ /%s' % baseConfig.get('apache2/startsite', 'ucs-overview')
11	@!@	12	@!@
12	-
13	--
14	.../conffiles/etc/apache2/conf-available/ucs.conf \| 7 -------	13	.../conffiles/etc/apache2/conf-available/ucs.conf \| 7 -------
15	.../conffiles/etc/apache2/ucs-sites.conf.d/ucs-sites.conf \| 2 --	14	.../conffiles/etc/apache2/ucs-sites.conf.d/ucs-sites.conf \| 2 --
16	2 files changed, 9 deletions(-)	15	2 files changed, 9 deletions(-)

Lines 1-5 Link Here

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/ucs-sites.conf.d/ucs-sites.conf (-4 lines)
1	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
2
3	RewriteEngine on	1	RewriteEngine on
4	RewriteOptions Inherit	2	RewriteOptions Inherit
5	ProxyPreserveHost on	3	ProxyPreserveHost on
6	-
7	--
8	.../etc/apache2/sites-available/000-default.d/00start \| 5 +++++	4	.../etc/apache2/sites-available/000-default.d/00start \| 5 +++++
9	.../conffiles/etc/apache2/sites-available/000-default.d/99end \| 1 +	5	.../conffiles/etc/apache2/sites-available/000-default.d/99end \| 1 +
10	.../conffiles/etc/apache2/sites-available/default.d/00start \| 5 -----	6	.../conffiles/etc/apache2/sites-available/default.d/00start \| 5 -----
11	.../conffiles/etc/apache2/sites-available/default.d/99end \| 1 -	7	.../conffiles/etc/apache2/sites-available/default.d/99end \| 1 -
12	.../univention-apache/debian/univention-apache.maintscript \| 2 ++	8	.../univention-apache/debian/univention-apache.maintscript \| 2 ++
13	.../debian/univention-apache.univention-config-registry \| 10 +++++-----	9	.../debian/univention-apache.univention-config-registry \| 10 +++++-----
14	6 files changed, 13 insertions(+), 11 deletions(-)	10	6 files changed, 13 insertions(+), 11 deletions(-)
15	create mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/00start	11	create mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/00start
16	create mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/99end	12	create mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/99end
17	delete mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/00start	13	delete mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/00start
18	delete mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/99end	14	delete mode 100644 branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/99end