Add and configure modules needed for domtool

diff --git a/debian/control b/debian/control
index b4826f9..e39c30f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Homepage: http://hcoop.net
 Package: hcoop-apache2-config
 Architecture: all
 Depends: libapache2-mod-waklog, apache2-mpm-prefork, apache2.2-common,
- apache2-suexec-custom, libapache2-mod-suphp, ${misc:Depends}
+ apache2-suexec-custom, libapache2-mod-suphp,
+ libapache2-mod-auth-kerb, ${misc:Depends}
 Description: Configuration for HCoop/Domtool Apache
  Configuration bits required for apache to operate as a user web node
  controlled by domtool.

diff --git a/debian/hcoop-apache2-config.install b/debian/hcoop-apache2-config.install
index d251603..5982463 100644 (file)
--- a/debian/hcoop-apache2-config.install
+++ b/debian/hcoop-apache2-config.install
@@ -3,4 +3,4 @@ files/apache_in.rules etc/ferm/service.in.d
 files/apache_out.rules etc/ferm/service.out.d
 files/www-data.hcoop etc/apache2/suexec
 files/suphp.conf.hcoop etc/suphp
-files/mods-available/suphp.conf.hcoop etc/apache2/mods-available
\ No newline at end of file
+files/mods-available/* etc/apache2/mods-available
\ No newline at end of file

diff --git a/debian/hcoop-apache2-config.postinst b/debian/hcoop-apache2-config.postinst
index 171f173..e7f81ca 100644 (file)
--- a/debian/hcoop-apache2-config.postinst
+++ b/debian/hcoop-apache2-config.postinst
@@ -18,7 +18,8 @@ set -e
 # the debian-policy package
 
 
-HCOOP_APACHE_MODULES="dav dav_fs dav_lock proxy proxy_http rewrite suexec suphp waklog"
+# make sure to keep in sync with prerm
+HCOOP_APACHE_MODULES="auth_kerb cache dav dav_fs dav_lock disk_cache expires include mime_magic negotiation proxy proxy_http rewrite ssl status suexec suphp waklog"
 
 case "$1" in
     configure)

diff --git a/debian/hcoop-apache2-config.postrm b/debian/hcoop-apache2-config.postrm
index ee024b9..e2b992a 100644 (file)
--- a/debian/hcoop-apache2-config.postrm
+++ b/debian/hcoop-apache2-config.postrm
@@ -16,8 +16,7 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
-HCOOP_APACHE_MODULES="dav dav_fs dav_lock rewrite suexec suphp waklog"
+HCOOP_APACHE_MODULES="auth_kerb cache dav dav_fs dav_lock disk_cache expires include mime_magic negotiation proxy proxy_http rewrite ssl status suexec suphp waklog"
 
 case "$1" in
     remove|purge)

diff --git a/debian/rules b/debian/rules
index 3d03936..eaed235 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ DEB_DIVERT_EXTENSION =.hcoop
 DEB_DIVERT_FILES_hcoop-apache2-config += \
        /etc/apache2/suexec/www-data.hcoop \
        /etc/suphp/suphp.conf.hcoop \
-       /etc/apache2/mods-available/suphp.conf.hcoop
+       /etc/apache2/mods-available/suphp.conf.hcoop \
+       /etc/apache2/mods-available/status.conf.hcoop
 
 DEB_DH_INSTALL_CRON_ARGS_DEFAULT = --name=hcoop-apache-sync-logs
 

diff --git a/files/conf.d/hcoop-ssi b/files/conf.d/hcoop-ssi
new file mode 100644 (file)
index 0000000..a37b3c7
--- /dev/null
+++ b/files/conf.d/hcoop-ssi
@@ -0,0 +1,4 @@
+<IfModule mod_include.c>
+    AddType text/html .shtml
+    AddOutputFilter INCLUDES .shtml
+</IfModule>
\ No newline at end of file

diff --git a/files/mods-available/status.conf.hcoop b/files/mods-available/status.conf.hcoop
new file mode 100644 (file)
index 0000000..eb435cf
--- /dev/null
+++ b/files/mods-available/status.conf.hcoop
@@ -0,0 +1,31 @@
+<IfModule mod_status.c>
+#
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Uncomment and change the "192.0.2.0/24" to allow access from other hosts.
+#
+<Location /server-status>
+    SetHandler server-status
+    Order allow,deny
+    Allow from all
+#    Deny from all
+#    Allow from 127.0.0.1 ::1
+#    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>
\ No newline at end of file