2 files changed, 131 insertions, 16 deletions
diff --git a/etc/apache/httpd-dev.conf b/etc/apache/httpd-dev.conf
new file mode 100644
index 0000000..6c51a9b
--- /dev/null
+++ b/etc/apache/httpd-dev.conf
@@ -0,0 +1,61 @@
+ServerRoot /usr/lib/apache2
+ServerName www.randomdan.homeip.net
+ServerAdmin dan.goodliffe@randomdan.homeip.net
+PidFile /var/run/apache2.pid
+
+ErrorLog /var/log/apache2/error.log
+LogFormat "%V %h %l %u %t \"%r\" %>s %b %Dus" common
+LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" ncsa
+CustomLog /var/log/apache2/access.log common
+CustomLog /var/log/apache2/ncsa.log ncsa
+
+LogLevel warn
+User apache
+Group web
+Listen 80
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+ServerSignature On
+
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule mime_magic_module modules/mod_mime_magic.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule ldap_module modules/mod_ldap.so
+LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule env_module modules/mod_env.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule fcgid_module modules/mod_fcgid.so
+LoadModule filter_module modules/mod_filter.so
+
+<Directory />
+        Options FollowSymLinks Indexes ExecCGI
+        AllowOverride All
+</Directory>
+
+DirectoryIndex index.php index.html
+VirtualDocumentRoot /home/randomdan/dev/%2/%1
+AccessFileName .htaccess
+UseCanonicalName Off
+HostnameLookups Off
+
+ScriptLog /var/www/files/script.log
+AddType application/x-httpd-php .php
+AddType text/xsl .xsl
+AddType text/xml .xml
+
+FilterDeclare COMPRESS CONTENT_SET
+FilterProvider COMPRESS DEFLATE %{CONTENT_TYPE}=~/^text/
+FilterProvider COMPRESS DEFLATE %{CONTENT_TYPE}='application/x-javascript'
+FilterProvider COMPRESS DEFLATE %{CONTENT_TYPE}='application/xml'
+FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no
+FilterChain COMPRESS
diff --git a/etc/apache/httpd.conf b/etc/apache/httpd.conf
index 19c28d5..82a3a0b 100644
--- a/etc/apache/httpd.conf
+++ b/etc/apache/httpd.conf
@@ -2,9 +2,13 @@ ServerRoot /usr/lib/apache2
 ServerName www.randomdan.homeip.net
 ServerAdmin dan.goodliffe@randomdan.homeip.net
 PidFile /var/run/apache2.pid
+
 ErrorLog /var/log/apache2/error.log
-LogFormat "%h %u %t %V \"%r\" %>s %b" common
+LogFormat "%V %h %l %u %t \"%r\" %>s %b %Dus" common
+LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" ncsa
 CustomLog /var/log/apache2/access.log common
+CustomLog /var/log/apache2/ncsa.log ncsa
+
 LogLevel warn
 User apache
 Group web
@@ -15,40 +19,90 @@ MaxKeepAliveRequests 100
 KeepAliveTimeout 15
 ServerSignature On
 
-LoadModule access_module modules/mod_access.so
+LoadModule authz_core_module modules/mod_authz_core.so
+Include /etc/apache2/modules.d/75_mod_perl.conf
+PerlSwitches -w -T -I/var/www/localhost/htdocs/bugzilla
+LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule mime_module modules/mod_mime.so
 LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule cgi_module modules/mod_cgi.so
 LoadModule cgid_module modules/mod_cgid.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
 LoadModule dir_module modules/mod_dir.so
-LoadModule php5_module modules/libphp5.so
-LoadModule mod_xslt modules/mod_xslt.so
 LoadModule deflate_module modules/mod_deflate.so
 LoadModule ldap_module modules/mod_ldap.so
-LoadModule auth_ldap_module modules/mod_auth_ldap.so
+LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule env_module modules/mod_env.so
 LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule fcgid_module modules/mod_fcgid.so
+LoadModule filter_module modules/mod_filter.so
+LoadModule php5_module /usr/lib/php5.6/apache2/libphp5.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule cache_disk_module modules/mod_cache_disk.so
+LoadModule status_module modules/mod_status.so
+
+CacheRoot   "/var/cache/apache2/"
+CacheEnable disk /
+CacheDirLevels 2
+CacheDirLength 1
 
 <Directory />
-        Options FollowSymLinks Indexes ExecCGI
-        AllowOverride All
+	Options FollowSymLinks Indexes ExecCGI
+	AllowOverride All
 </Directory>
 
-DirectoryIndex index.php index.html index.xml index.htm index.xphp index.cgi
+<Location /server-status>
+	SetHandler server-status
+</Location>
+ExtendedStatus On
+
+DirectoryIndex index.php index.html
 VirtualDocumentRoot /var/www/vhosts/%0/
 AccessFileName .htaccess
-AddOutputFilterByType DEFLATE text/html text/plain text/xml
 UseCanonicalName Off
-DefaultType text/plain
 HostnameLookups Off
-AddHandler cgi-script .cgi
-AddOutputFilterByType mod_xslt text/xml
 
-ScriptLog /var/www/files/script.log
 AddType application/x-httpd-php .php
-AddType application/x-httpd-php .xphp
 AddType text/xsl .xsl
-AddType text/xml .xml
+
+# Compress output
+FilterDeclare COMPRESS CONTENT_SET
+FilterProvider COMPRESS DEFLATE %{CONTENT_TYPE}=~/^text/
+FilterProvider COMPRESS DEFLATE %{CONTENT_TYPE}='application/x-javascript'
+FilterProvider COMPRESS DEFLATE %{CONTENT_TYPE}='application/xml'
+FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no
+FilterChain COMPRESS
+
+# Minify CSS and JS
+PerlModule Apache2::Filter::Minifier::CSS
+PerlSetVar CssMinifier CSS::Minifier::XS
+PerlModule Apache2::Filter::Minifier::JavaScript
+PerlSetVar JavaScriptMinifier JavaScript::Minifier::XS
+<LocationMatch "\.css$">
+	PerlOutputFilterHandler   Apache2::Filter::Minifier::CSS
+</LocationMatch>
+<LocationMatch "\.js$">
+	PerlOutputFilterHandler   Apache2::Filter::Minifier::JavaScript
+</LocationMatch>
+<LocationMatch "^/js/">
+	PerlOutputFilterHandler   Apache2::Filter::Minifier::JavaScript
+</LocationMatch>
+
+# Host specific stuff
+<VirtualHost *>
+	# Needed to stop whatever is first from being the default
+</VirtualHost>
+<VirtualHost *>
+	ServerName bugzilla.randomdan.homeip.net
+	<FilesMatch \.cgi$>
+		SetHandler perl-script
+		PerlHandler ModPerl::Registry
+		Options ExecCGI
+	</FilesMatch>
+	PerlModule ModPerl::Registry
+	PerlModule CGI
+	PerlSendHeader On
+</VirtualHost>