[debian-edu-commits] r83702 - in branches/debian-edu-config/jessie: . cf debian etc/apache2 etc/apache2/conf-available etc/apache2/conf.d etc/apache2/sites-available
pere at alioth.debian.org
pere at alioth.debian.org
Thu Aug 21 11:12:25 UTC 2014
Author: pere
Date: 2014-08-21 11:12:24 +0000 (Thu, 21 Aug 2014)
New Revision: 83702
Added:
branches/debian-edu-config/jessie/debian/debian-edu-config.maintscript
branches/debian-edu-config/jessie/etc/apache2/conf-available/
branches/debian-edu-config/jessie/etc/apache2/conf-available/debian-edu-config-doc.conf
branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default.conf
branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default.conf
Removed:
branches/debian-edu-config/jessie/etc/apache2/conf.d/debian-edu-config-doc
branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default
branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default
Modified:
branches/debian-edu-config/jessie/Makefile
branches/debian-edu-config/jessie/cf/cf.apache2
branches/debian-edu-config/jessie/debian/changelog
branches/debian-edu-config/jessie/debian/compat
branches/debian-edu-config/jessie/debian/control
Log:
* Migrate setup to Apache 2.4 (Closes: #669762). Rename conffiles
/etc/apache2/conf.d/debian-edu-config-doc,
/etc/apache2/sites-available/debian-edu-default and
/etc/apache2/sites-available/debian-edu-ssl-default to
/etc/apache2/conf-available/debian-edu-config-doc.conf,
/etc/apache2/sites-available/debian-edu-default.conf and
/etc/apache2/sites-available/debian-edu-ssl-default.conf. Update
Apache 2 cfengine rules to enable configuration on fresh installs.
* Update from debhelper version 7 to 9 to get the support needed for
the Apache 2.4 migration.
Modified: branches/debian-edu-config/jessie/Makefile
===================================================================
--- branches/debian-edu-config/jessie/Makefile 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/Makefile 2014-08-21 11:12:24 UTC (rev 83702)
@@ -151,9 +151,9 @@
xdg/autostart/welcome-webpage.desktop \
lsb-release \
apache2/mods-available/debian-edu-userdir.conf \
- apache2/sites-available/debian-edu-default \
- apache2/sites-available/debian-edu-ssl-default \
- apache2/conf.d/debian-edu-config-doc \
+ apache2/sites-available/debian-edu-default.conf \
+ apache2/sites-available/debian-edu-ssl-default.conf \
+ apache2/conf-available/debian-edu-config-doc.conf \
nagios3/debian-edu/cgi.cfg \
nagios3/debian-edu/commands.cfg \
nagios3/debian-edu/contactgroups.cfg \
Modified: branches/debian-edu-config/jessie/cf/cf.apache2
===================================================================
--- branches/debian-edu-config/jessie/cf/cf.apache2 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/cf/cf.apache2 2014-08-21 11:12:24 UTC (rev 83702)
@@ -11,8 +11,9 @@
# Enableing ssl
"/usr/sbin/a2enmod ssl"
# Use our own default site configuration, and ssl site configuration.
- "/usr/sbin/a2ensite debian-edu-default"
- "/usr/sbin/a2ensite debian-edu-ssl-default"
+ "/usr/sbin/a2enconf debian-edu-config-doc.conf"
+ "/usr/sbin/a2ensite debian-edu-default.conf"
+ "/usr/sbin/a2ensite debian-edu-ssl-default.conf"
# Disable the stock debian sitefile
"/usr/sbin/a2dissite default"
# Reload apache2 for changes to take effect
Modified: branches/debian-edu-config/jessie/debian/changelog
===================================================================
--- branches/debian-edu-config/jessie/debian/changelog 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/debian/changelog 2014-08-21 11:12:24 UTC (rev 83702)
@@ -6,6 +6,16 @@
* Adjust the ldap-debian-edu-install script to stop named also when
failing to get a Samba SID. This avoid hanging the installer when
unable to set up LDAP and Kerberos for the the Main Server.
+ * Migrate setup to Apache 2.4 (Closes: #669762). Rename conffiles
+ /etc/apache2/conf.d/debian-edu-config-doc,
+ /etc/apache2/sites-available/debian-edu-default and
+ /etc/apache2/sites-available/debian-edu-ssl-default to
+ /etc/apache2/conf-available/debian-edu-config-doc.conf,
+ /etc/apache2/sites-available/debian-edu-default.conf and
+ /etc/apache2/sites-available/debian-edu-ssl-default.conf. Update
+ Apache 2 cfengine rules to enable configuration on fresh installs.
+ * Update from debhelper version 7 to 9 to get the support needed for
+ the Apache 2.4 migration.
-- Petter Reinholdtsen <pere at debian.org> Tue, 19 Aug 2014 22:25:29 +0200
Modified: branches/debian-edu-config/jessie/debian/compat
===================================================================
--- branches/debian-edu-config/jessie/debian/compat 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/debian/compat 2014-08-21 11:12:24 UTC (rev 83702)
@@ -1 +1 @@
-7
+9
Modified: branches/debian-edu-config/jessie/debian/control
===================================================================
--- branches/debian-edu-config/jessie/debian/control 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/debian/control 2014-08-21 11:12:24 UTC (rev 83702)
@@ -8,7 +8,7 @@
Alexander Alemayhu <alexander at bitraf.no>,
Mike Gabriel <sunweaver at debian.org>
Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 7), python-support
+Build-Depends: debhelper (>= 9), python-support
Build-Depends-Indep: po-debconf, po4a
Homepage: http://www.skolelinux.org
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-edu/trunk/src/debian-edu-config/
@@ -16,6 +16,7 @@
Package: debian-edu-config
Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${python:Depends}, debconf-utils, cfengine2, libconfig-inifiles-perl, mime-support, libnet-ldap-perl, ng-utils, host, desktop-profiles, lsb-base, lsb-release, ssl-cert, openssl, libfilesys-df-perl, libtext-unaccent-perl, libhtml-fromtext-perl, libio-socket-ssl-perl, discover, tftp | tftp-hpa, debian-edu-artwork, education-tasks (>= 0.853), net-tools, patch, base-files (>= 5.3), python-notify, libterm-readkey-perl, fping, ldap-utils, libnet-netmask-perl, smbldap-tools (>= 0.9.7-1), lockfile-progs, libproxy-tools, libwebkitgtk-1.0-0
Recommends: resolvconf, ddccontrol | xresprobe, syslinux, memtest86+, libnotify-bin, lsof, binutils
Suggests: atftpd | tftpd-hpa
Added: branches/debian-edu-config/jessie/debian/debian-edu-config.maintscript
===================================================================
--- branches/debian-edu-config/jessie/debian/debian-edu-config.maintscript (rev 0)
+++ branches/debian-edu-config/jessie/debian/debian-edu-config.maintscript 2014-08-21 11:12:24 UTC (rev 83702)
@@ -0,0 +1,3 @@
+mv_conffile /etc/apache2/sites-available/debian-edu-default /etc/apache2/sites-available/debian-edu-default.conf 1.719
+mv_conffile /etc/apache2/sites-available/debian-edu-ssl-default /etc/apache2/sites-available/debian-edu-ssl-default.conf 1.719
+mv_conffile /etc/apache2/conf.d/debian-edu-config-doc /etc/apache2/conf-available/debian-edu-config-doc.conf 1.719
Copied: branches/debian-edu-config/jessie/etc/apache2/conf-available/debian-edu-config-doc.conf (from rev 83699, branches/debian-edu-config/jessie/etc/apache2/conf.d/debian-edu-config-doc)
===================================================================
--- branches/debian-edu-config/jessie/etc/apache2/conf-available/debian-edu-config-doc.conf (rev 0)
+++ branches/debian-edu-config/jessie/etc/apache2/conf-available/debian-edu-config-doc.conf 2014-08-21 11:12:24 UTC (rev 83702)
@@ -0,0 +1,16 @@
+#
+# URL http://<host>/debian-edu-doc giving access to the the contents of the debian-edu-doc package
+# This is linked from the local webpage.
+#
+#
+Alias /debian-edu-doc /usr/share/doc/debian-edu-doc/
+
+<Directory /usr/share/doc/debian-edu-doc/>
+ AllowOverride None
+ Options Indexes FollowSymLinks MultiViews
+
+ # everyone have access to the docs
+ Order deny,allow
+ Deny from none
+ Allow from all
+</Directory>
Deleted: branches/debian-edu-config/jessie/etc/apache2/conf.d/debian-edu-config-doc
===================================================================
--- branches/debian-edu-config/jessie/etc/apache2/conf.d/debian-edu-config-doc 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/etc/apache2/conf.d/debian-edu-config-doc 2014-08-21 11:12:24 UTC (rev 83702)
@@ -1,16 +0,0 @@
-#
-# URL http://<host>/debian-edu-doc giving access to the the contents of the debian-edu-doc package
-# This is linked from the local webpage.
-#
-#
-Alias /debian-edu-doc /usr/share/doc/debian-edu-doc/
-
-<Directory /usr/share/doc/debian-edu-doc/>
- AllowOverride None
- Options Indexes FollowSymLinks MultiViews
-
- # everyone have access to the docs
- Order deny,allow
- Deny from none
- Allow from all
-</Directory>
Deleted: branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default
===================================================================
--- branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default 2014-08-21 11:12:24 UTC (rev 83702)
@@ -1,63 +0,0 @@
-<VirtualHost *:80>
- ServerName www
- ServerAdmin webmaster at postoffice.intern
-
- DocumentRoot /etc/debian-edu/www/
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /etc/debian-edu/www/ >
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
- # Workaround for Spanish pages, making sure they get text/html
- # and not application/ecmascript as their mime type
- <Files *.html.es>
- ForceType text/html
- </Files>
-
- # Workaround for Norwegian Bokmål pages, making sure they get
- # text/html and not application/matematica as their mime type
- <Files *.html.nb>
- ForceType text/html
- </Files>
-
- ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
- <Directory "/usr/lib/cgi-bin">
- AllowOverride None
- Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Order allow,deny
- Allow from all
- </Directory>
-
- ErrorLog /var/log/apache2/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access.log combined
- ServerSignature On
-
- Alias /doc/ "/usr/share/doc/"
- <Directory "/usr/share/doc/">
- Options Indexes MultiViews FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
- Allow from 127.0.0.0/255.0.0.0 ::1/128
- </Directory>
-
- # add alias for munin, though it should really be handled by munin itself,
- # rather than assuming /var/www is the defaultroot..
- Alias /munin "/var/cache/munin/www/"
- <Directory /var/cache/munin/www/ >
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
-</VirtualHost>
Copied: branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default.conf (from rev 83699, branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default)
===================================================================
--- branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default.conf (rev 0)
+++ branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-default.conf 2014-08-21 11:12:24 UTC (rev 83702)
@@ -0,0 +1,63 @@
+<VirtualHost *:80>
+ ServerName www
+ ServerAdmin webmaster at postoffice.intern
+
+ DocumentRoot /etc/debian-edu/www/
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /etc/debian-edu/www/ >
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ # Workaround for Spanish pages, making sure they get text/html
+ # and not application/ecmascript as their mime type
+ <Files *.html.es>
+ ForceType text/html
+ </Files>
+
+ # Workaround for Norwegian Bokmål pages, making sure they get
+ # text/html and not application/matematica as their mime type
+ <Files *.html.nb>
+ ForceType text/html
+ </Files>
+
+ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+ <Directory "/usr/lib/cgi-bin">
+ AllowOverride None
+ Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+ Order allow,deny
+ Allow from all
+ </Directory>
+
+ ErrorLog /var/log/apache2/error.log
+
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+ LogLevel warn
+
+ CustomLog /var/log/apache2/access.log combined
+ ServerSignature On
+
+ Alias /doc/ "/usr/share/doc/"
+ <Directory "/usr/share/doc/">
+ Options Indexes MultiViews FollowSymLinks
+ AllowOverride None
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.0/255.0.0.0 ::1/128
+ </Directory>
+
+ # add alias for munin, though it should really be handled by munin itself,
+ # rather than assuming /var/www is the defaultroot..
+ Alias /munin "/var/cache/munin/www/"
+ <Directory /var/cache/munin/www/ >
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+</VirtualHost>
Deleted: branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default
===================================================================
--- branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default 2014-08-21 09:42:14 UTC (rev 83701)
+++ branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default 2014-08-21 11:12:24 UTC (rev 83702)
@@ -1,63 +0,0 @@
-NameVirtualHost *:443
-<VirtualHost *:443>
-
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
- SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-
- ServerName www
- ServerAdmin webmaster at postoffice.intern
-
- DocumentRoot /etc/debian-edu/www/
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /etc/debian-edu/www/ >
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
- #Workaround for spanish pages
- <Files *.html.es>
- ForceType text/html
- </Files>
-
- ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
- <Directory "/usr/lib/cgi-bin">
- AllowOverride None
- Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Order allow,deny
- Allow from all
- </Directory>
-
- ErrorLog /var/log/apache2/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access.log combined
- ServerSignature On
-
- Alias /doc/ "/usr/share/doc/"
- <Directory "/usr/share/doc/">
- Options Indexes MultiViews FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
- Allow from 127.0.0.0/255.0.0.0 ::1/128
- </Directory>
-
- # add alias for munin, though it should really be handled by munin itself,
- # rather than assuming /var/www is the defaultroot..
- Alias /munin "/var/www/munin/"
- <Directory /etc/debian-edu/www/ >
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
-
-</VirtualHost>
Copied: branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default.conf (from rev 83699, branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default)
===================================================================
--- branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default.conf (rev 0)
+++ branches/debian-edu-config/jessie/etc/apache2/sites-available/debian-edu-ssl-default.conf 2014-08-21 11:12:24 UTC (rev 83702)
@@ -0,0 +1,63 @@
+NameVirtualHost *:443
+<VirtualHost *:443>
+
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
+ ServerName www
+ ServerAdmin webmaster at postoffice.intern
+
+ DocumentRoot /etc/debian-edu/www/
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /etc/debian-edu/www/ >
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ #Workaround for spanish pages
+ <Files *.html.es>
+ ForceType text/html
+ </Files>
+
+ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+ <Directory "/usr/lib/cgi-bin">
+ AllowOverride None
+ Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+ Order allow,deny
+ Allow from all
+ </Directory>
+
+ ErrorLog /var/log/apache2/error.log
+
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+ LogLevel warn
+
+ CustomLog /var/log/apache2/access.log combined
+ ServerSignature On
+
+ Alias /doc/ "/usr/share/doc/"
+ <Directory "/usr/share/doc/">
+ Options Indexes MultiViews FollowSymLinks
+ AllowOverride None
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.0/255.0.0.0 ::1/128
+ </Directory>
+
+ # add alias for munin, though it should really be handled by munin itself,
+ # rather than assuming /var/www is the defaultroot..
+ Alias /munin "/var/www/munin/"
+ <Directory /etc/debian-edu/www/ >
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+
+</VirtualHost>
More information about the debian-edu-commits
mailing list