gistfile1.txt

diff --git a/cfengine/inputs/cf.classes b/cfengine/inputs/cf.classes
index 722c91c..313a023 100644
--- a/cfengine/inputs/cf.classes
+++ b/cfengine/inputs/cf.classes
@@ -116,11 +116,12 @@ groups:
         service_nginx       = ( oooapps oooapps2 orvsd_dev yin load1 load2 )
         service_squid       = ( nohost )
         service_varnish     = ( brewer busybox deluge drupal_web_node
-                                denise_drupal_org efs
-                                grand hawthorn madrone mulgara noble occc
-                                oooapps openclipfont openht openvoting parrotvm
-                                pine twist www_phpbb_com www_inkscape_org
-                                www1_mozillazine_org www2_mozillazine_org yang
+                                denise_drupal_org efs grand hawthorn kt1
+                                madrone mulgara noble occc oooapps openclipfont
+                                openht openvoting parrotvm pine twist
+                                www_phpbb_com www_inkscape_org
+                                www1_mozillazine_org
+        www2_mozillazine_org yang
                                 yin )
         service_wwwcache    = ( service_squid service_varnish
                                 -denise_drupal_org )
diff --git a/files/etc/apache2/vhosts.d/kt1/kerneltrap.org.conf b/files/etc/apache2/vhosts.d/kt1/kerneltrap.org.conf
new file mode 100644
index 0000000..5f04609
--- /dev/null
+++ b/files/etc/apache2/vhosts.d/kt1/kerneltrap.org.conf
@@ -0,0 +1,18 @@
+<VirtualHost *:8080>
+    ServerName kerneltrap.org
+    ServerAlias kt1.osuosl.org
+
+    DocumentRoot /var/www/html
+    php_admin_value open_basedir ".:/tmp:/usr/share/php:/var/www/html/"
+
+    <Directory /var/www/html>
+        Options Indexes FollowSymlinks
+        AllowOverride All
+        Order Allow,Deny
+        Allow From All
+    </Directory>
+
+    CustomLog "|/usr/sbin/cronolog /var/log/apache2/kerneltrap.org/transfer/%Y%m%d.log" combined
+    ErrorLog "|/usr/sbin/cronolog /var/log/apache2/kerneltrap.org/error/%Y%m%d.log"
+
+</VirtualHost>
diff --git a/files/etc/conf.d/apache2/kt1 b/files/etc/conf.d/apache2/kt1
index f0bfc2d..0cea31b 100644
--- a/files/etc/conf.d/apache2/kt1
+++ b/files/etc/conf.d/apache2/kt1
@@ -37,7 +37,7 @@
 #  SSL_OSL    Use the default *.osuosl.org ssl cert
 #  WWWCACHE   Enables support for using Squid
 #
-APACHE2_OPTS="-D INFO -D STATUS -D LANGUAGE -D SSL -D SUEXEC -D PHP5"
+APACHE2_OPTS="-D INFO -D STATUS -D LANGUAGE -D SSL -D SUEXEC -D PHP5 -D WWWCACHE -D RPAF"
 
 # Extended options for advanced uses of Apache ONLY
 # You don't need to edit these unless you are doing crazy Apache stuff
diff --git a/files/etc/conf.d/varnishd/kt1 b/files/etc/conf.d/varnishd/kt1
new file mode 100644
index 0000000..4378641
--- /dev/null
+++ b/files/etc/conf.d/varnishd/kt1
@@ -0,0 +1,23 @@
+# /etc/conf.d/varnishd
+
+# options passed to varnish on startup
+# please see the varnishd man page for more options
+
+VARNISHD_OPTS="-a :80 \
+                -T 127.0.0.1:8181 \
+                -f /etc/varnish/default.vcl \
+                -p thread_pools=4 \
+                -p thread_pool_min=15 \
+                -p thread_pool_max=100 \
+                -p thread_pool_timeout=60 \
+                -p listen_depth=2048 \
+                -p lru_interval=20 \
+                -h classic,169313 \
+                -p sess_workspace=4096 \
+                -p connect_timeout=600 \
+                -s file,/var/cache/varnish.cache,1G \
+                -p max_restarts=6"
+
+# arguments passed to varnishncsa
+# please see the varnishncsa man page for more options
+VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log"