Attachment #7988 for bug #42196

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

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-apache (9.0.1-1) unstable; urgency=low

  * Bug #42196: Fix default configuration

 -- Philipp Hahn <hahn@univention.de>  Thu, 08 Sep 2016 10:10:19 +0200

univention-apache (9.0.0-4) unstable; urgency=low

univention-apache (9.0.0-4) unstable; urgency=low

  * Bug #42196: apache config upgrade

  * 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

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.maintscript (+1 lines)

Line 0	Link Here

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~

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.postinst (-1 lines)

Lines 33-39	Link Here

#DEBHELPER#

#DEBHELPER#

# update to 4.2-0

# 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

if dpkg --compare-versions "$2" lt-nl 9.0.0; then

	ucr update

	ucr update

	a2dismod auth_pam

	a2dismod auth_pam

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.postrm (-2 lines)

Lines 30-37	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

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

if [ "$1" = "purge" ]; then

if [ "$1" = "purge" ]; then

	rm -rf /etc/univention/apache

	rm -rf /etc/univention/apache

fi

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(-)

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/conf-available/ucs.conf (-2 lines)

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

ServerAdmin webmaster@@%@hostname@%@.@%@domainname@%@

ServerAdmin webmaster@@%@hostname@%@.@%@domainname@%@

ServerSignature On

ServerSignature On

CustomLog /var/log/apache2/access.log combined

ErrorLog /var/log/apache2/error.log

# Possible values include: debug, info, notice, warn, error, crit,

# Possible values include: debug, info, notice, warn, error, crit,

# alert, emerg.

# alert, emerg.

LogLevel @%@apache2/loglevel@%@

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

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/000-default.d/00start (+5 lines)

Line 0	Link Here

@%@UCRWARNING=# @%@

<VirtualHost *:80>

	Include /etc/apache2/ucs-sites.conf.d

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

Line 0	Link Here

</VirtualHost>

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/conffiles/etc/apache2/sites-available/default.d/00start (-5 lines)

Lines 1-5	Link Here

@%@UCRWARNING=# @%@

<VirtualHost *:80>

	Include /etc/apache2/ucs-sites.conf.d

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

Line 1	Link Here

</VirtualHost>

(-)a/branches/ucs-4.2/ucs-4.2-0/services/univention-apache/debian/univention-apache.maintscript (+2 lines)

Line 1	Link Here

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~

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~

mv_conffile /etc/apache2/sites-available/default.d/00start /etc/apache2/sites-available/000-default.d/00start 9.0.1~

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