diff --git a/jenkins/default-vhost b/jenkins/default-vhost
new file mode 100644
index 0000000..2fdac07
--- /dev/null
+++ b/jenkins/default-vhost
@@ -0,0 +1,42 @@
+
+ ServerAdmin webmaster@localhost
+ ServerName irrsinn.net
+
+ DocumentRoot /var/www
+
+ Options FollowSymLinks
+ AllowOverride None
+
+
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+
+
+ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+
+ AllowOverride None
+ Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+ Order allow,deny
+ Allow from all
+
+
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+ LogLevel warn
+
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+Alias /doc/ "/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
+
+
+
\ No newline at end of file
diff --git a/jenkins/default.vcl b/jenkins/default.vcl
new file mode 100644
index 0000000..2e0ee89
--- /dev/null
+++ b/jenkins/default.vcl
@@ -0,0 +1 @@
+include "/etc/varnish/projects.irrsinn.net.vcl";
\ No newline at end of file
diff --git a/jenkins/fabfile.py b/jenkins/fabfile.py
index 4966c13..464f9bc 100644
--- a/jenkins/fabfile.py
+++ b/jenkins/fabfile.py
@@ -1,5 +1,5 @@
from __future__ import with_statement
-from fabric.api import settings, abort, run, cd, env
+from fabric.api import settings, abort, run, cd, env, put
env.hosts = ['projects.irrsinn.net']
env.user = 'root'
@@ -7,6 +7,8 @@ env.user = 'root'
def apache_config():
with cd('/etc/apache2/sites-available'):
put('projects.irrsinn.net-vhost', 'projects.irrsinn.net')
+ put('default-vhost', 'default')
+ run('apache2ctl -k restart')
def base_installs():
run('apt-get update')
@@ -47,3 +49,10 @@ def tomcat_install():
run('/etc/init.d/tomcat7 start')
def varnish_config():
+ with cd('/etc/varnish'):
+ put('projects.irrsinn.net.vcl', 'projects.irrsinn.net.vcl', mode=0755)
+ put('default.vcl', 'default.vcl', mode=0755)
+ run('pkill varnishd', warn_only=True)
+ run('apache2ctl -k restart')
+ run('service varnish restart')
+ run('varnishd -f /etc/varnish/default.vcl -s malloc,256M -a :80')
\ No newline at end of file
diff --git a/jenkins/projects.irrsinn.net-vhost b/jenkins/projects.irrsinn.net-vhost
index 8b3d862..7f70700 100644
--- a/jenkins/projects.irrsinn.net-vhost
+++ b/jenkins/projects.irrsinn.net-vhost
@@ -1,12 +1,9 @@
-
+
ServerAdmin averymd@irrsinn.net
ServerName projects.irrsinn.net
DocumentRoot /var/www/projects.irrsinn.net
-
- Options FollowSymLinks
- AllowOverride None
-
+
Options Indexes FollowSymLinks MultiViews
AllowOverride All
diff --git a/jenkins/projects.irrsinn.net.vcl b/jenkins/projects.irrsinn.net.vcl
new file mode 100644
index 0000000..80909b7
--- /dev/null
+++ b/jenkins/projects.irrsinn.net.vcl
@@ -0,0 +1,28 @@
+backend jenkins {
+ .host = "projects.irrsinn.net";
+ .port = "8080";
+ .connect_timeout = 300s;
+ .first_byte_timeout = 120s;
+ .between_bytes_timeout = 300s;
+ .max_connections = 800;
+}
+
+backend git {
+ .host = "projects.irrsinn.net";
+ .port = "8088";
+ .connect_timeout = 300s;
+ .first_byte_timeout = 120s;
+ .between_bytes_timeout = 300s;
+ .max_connections = 800;
+}
+
+sub vcl_recv {
+
+ if ((req.http.host ~ "projects.irrsinn.net") && (req.url ~ "jenkins"))
+ {
+ set req.backend = jenkins;
+ } else {
+ set req.backend = git;
+ }
+ return (pass);
+}