diff --git a/roles/webserver/files/etc/apache2/sites-available/wiki.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/wiki.thunix.net.conf
new file mode 100644
index 0000000..6fcc681
--- /dev/null
+++ b/roles/webserver/files/etc/apache2/sites-available/wiki.thunix.net.conf
@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@thunix.net
+    ServerName wiki.thunix.net
+    DocumentRoot /var/www/wiki.thunix.net
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    <Directorymatch "^/.*/\.git/">
+		Order deny,allow
+		Deny from all
+	</Directorymatch>
+</VirtualHost>
diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml
index 60a59ba..45c40b1 100644
--- a/roles/webserver/tasks/apache.yml
+++ b/roles/webserver/tasks/apache.yml
@@ -82,3 +82,8 @@
   copy:
     src: ../files/etc/apache2/sites-available/stats.thunix.net.conf
     dest: /etc/apache2/sites-available/stats.thunix.net.conf
+
+- name: Deploy apache site conf for wiki.thunix.net
+  copy:
+    src: ../files/etc/apache2/sites-available/wiki.thunix.net.conf
+    dest: /etc/apache2/sites-available/wiki.thunix.net.conf
diff --git a/roles/webserver/tasks/codedeploy.yml b/roles/webserver/tasks/codedeploy.yml
index 066e1db..e29e8bf 100644
--- a/roles/webserver/tasks/codedeploy.yml
+++ b/roles/webserver/tasks/codedeploy.yml
@@ -10,6 +10,11 @@
     dest: /var/gopher
     force: yes
 
+- git:
+    repo: 'https://tildegit.org/thunix/wiki.git'
+    dest: /var/www/wiki.thunix.net
+    force: yes
+
 - file:
     path: /var/www/autoconfig/mail
     state: directory