[Pkg-apache-commits] r1186 - in /trunk/apache2: ./ config-dir/mods-available/
sf at alioth.debian.org
sf at alioth.debian.org
Tue Apr 20 20:56:33 UTC 2010
Author: sf
Date: Tue Apr 20 20:56:33 2010
New Revision: 1186
URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1186
Log:
Update the default config for several modules
Added:
trunk/apache2/config-dir/mods-available/ldap.conf (with props)
trunk/apache2/config-dir/mods-available/proxy_balancer.conf (with props)
trunk/apache2/config-dir/mods-available/proxy_ftp.conf (with props)
Modified:
trunk/apache2/apache2.2-common.postinst
trunk/apache2/changelog
trunk/apache2/config-dir/mods-available/ssl.conf
trunk/apache2/config-dir/mods-available/status.conf
Modified: trunk/apache2/apache2.2-common.postinst
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.postinst?rev=1186&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.postinst (original)
+++ trunk/apache2/apache2.2-common.postinst Tue Apr 20 20:56:33 2010
@@ -43,12 +43,11 @@
fi
-if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.4-2; then
- echo -n activating new config files ...
- for a in actions alias autoindex info mime negotiation setenvif status ; do
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.15-4~ ; then
+ echo activating new config files ...
+ for a in ldap proxy_balancer proxy_ftp ; do
if mod_is_enabled $a && [ ! -e /etc/apache2/mods-enabled/$a.conf ] ; then
- ln -sf ../mods-available/$a.conf /etc/apache2/mods-enabled/$a.conf
- echo -n " $a.conf"
+ a2enmod $a
fi
done
echo " done."
Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1186&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Apr 20 20:56:33 2010
@@ -7,12 +7,25 @@
is a nuisance for use of apache2 as a reverse proxy, which is much
more common than the use as forward proxy. Extend the comments
in the file.
+ * Change defaults or add example configs for some modules:
+ status.conf:
+ - enable ExtendedStatus by default
+ - enable ProxyStatus by default
+ - document SeeRequestTail directive
+ proxy_ftp.conf:
+ - set 'ProxyFtpDirCharset UTF-8' by default
+ ldap.conf:
+ - enable /ldap-status page, allow it from localhost by default
+ proxy_balancer.conf:
+ - add (disabled) example for /balancer-manager page
+ ssl.conf:
+ - document SSLStrictSNIVHostCheck directive
+ * Add symlink from apachectl to apache2ctl to be more compatible with
+ upstream. Apache httpd 1.3 hasn't been in Debian for some time.
* Simplify logrotate script. Closes: #576105
* Remove empty directory /usr/lib/debug/usr/sbin in mpm packages.
Closes: #576089
* Fix apxs2 to work with perl 5.12rc3. Closes: #577239
- * Add symlink from apachectl to apache2ctl to be more compatible with
- upstream. Apache httpd 1.3 hasn't been in Debian for some time.
-- Stefan Fritsch <sf at debian.org> Sat, 03 Apr 2010 15:20:42 +0200
Added: trunk/apache2/config-dir/mods-available/ldap.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/ldap.conf?rev=1186&op=file
==============================================================================
--- trunk/apache2/config-dir/mods-available/ldap.conf (added)
+++ trunk/apache2/config-dir/mods-available/ldap.conf Tue Apr 20 20:56:33 2010
@@ -1,0 +1,8 @@
+<Location /ldap-status>
+ SetHandler ldap-status
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.1 ::1
+# Allow from 192.0.2.0/24
+ Satisfy all
+</Location>
Propchange: trunk/apache2/config-dir/mods-available/ldap.conf
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/apache2/config-dir/mods-available/proxy_balancer.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/proxy_balancer.conf?rev=1186&op=file
==============================================================================
--- trunk/apache2/config-dir/mods-available/proxy_balancer.conf (added)
+++ trunk/apache2/config-dir/mods-available/proxy_balancer.conf Tue Apr 20 20:56:33 2010
@@ -1,0 +1,16 @@
+<IfModule mod_proxy_balancer.c>
+
+# Balancer manager enables dynamic update of balancer members
+# (needs mod_status). Uncomment to enable.
+#
+#<IfModule mod_status.c>
+#<Location /balancer-manager>
+# SetHandler balancer-manager
+# Order deny,allow
+# Deny from all
+# Allow from 127.0.0.1 ::1
+# Satisfy all
+#</Location>
+#</IfModule>
+
+</IfModule>
Propchange: trunk/apache2/config-dir/mods-available/proxy_balancer.conf
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/apache2/config-dir/mods-available/proxy_ftp.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/proxy_ftp.conf?rev=1186&op=file
==============================================================================
--- trunk/apache2/config-dir/mods-available/proxy_ftp.conf (added)
+++ trunk/apache2/config-dir/mods-available/proxy_ftp.conf Tue Apr 20 20:56:33 2010
@@ -1,0 +1,6 @@
+<IfModule mod_proxy_ftp.c>
+
+# Define the character set for proxied FTP listings. Default is ISO-8859-1
+ProxyFtpDirCharset UTF-8
+
+</IfModule>
Propchange: trunk/apache2/config-dir/mods-available/proxy_ftp.conf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/apache2/config-dir/mods-available/ssl.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/ssl.conf?rev=1186&op=diff
==============================================================================
--- trunk/apache2/config-dir/mods-available/ssl.conf (original)
+++ trunk/apache2/config-dir/mods-available/ssl.conf Tue Apr 20 20:56:33 2010
@@ -63,7 +63,11 @@
SSLProtocol all -SSLv2
# Allow insecure renegotiation with clients which do not yet support the
-# secure renegotiation protocol
-# SSLInsecureRenegotiation on
+# secure renegotiation protocol. Default: Off
+#SSLInsecureRenegotiation on
+
+# Whether to forbid non-SNI clients to access name based virtual hosts.
+# Default: Off
+#SSLStrictSNIVHostCheck On
</IfModule>
Modified: trunk/apache2/config-dir/mods-available/status.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/status.conf?rev=1186&op=diff
==============================================================================
--- trunk/apache2/config-dir/mods-available/status.conf (original)
+++ trunk/apache2/config-dir/mods-available/status.conf Tue Apr 20 20:56:33 2010
@@ -12,4 +12,19 @@
# Allow from 192.0.2.0/24
</Location>
+# Keep track of extended status information for each request
+ExtendedStatus On
+
+# Determine if mod_status displays the first 63 characters of a request or
+# the last 63, assuming the request itself is greater than 63 chars.
+# Default: Off
+#SeeRequestTail On
+
+
+<IfModule mod_proxy.c>
+ # Show Proxy LoadBalancer status in mod_status
+ ProxyStatus On
</IfModule>
+
+
+</IfModule>
More information about the Pkg-apache-commits
mailing list