From 806ecf0439d6e7a345290700baf5a1e4ae213c9e Mon Sep 17 00:00:00 2001
From: Niels Serup <ns@metanohi.org>
Date: Thu, 11 Aug 2011 00:00:52 +0200
Subject: [PATCH] No content change.

---
 .gitignore          |  1 -
 apache-config       | 41 +++++++++++++++++++++++++++++++++++++++++
 scripts/hook_new.sh |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 apache-config

diff --git a/.gitignore b/.gitignore
index d29dd6e..d377ae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 /extra/atom.xml
 log.mege
 .finallog.mege
-apache-config
 .debug
 /mege
 .test.org
diff --git a/apache-config b/apache-config
new file mode 100644
index 0000000..6256cd2
--- /dev/null
+++ b/apache-config
@@ -0,0 +1,41 @@
+<VirtualHost *:80>
+
+    ServerName metanohi.name
+    ServerAlias nohi.lcl
+    ServerAdmin ns@metanohi.org
+
+    DocumentRoot /home/niels/www/meta/nohi
+
+    Alias /robots.txt   /home/niels/www/meta/nohi/extra/robots.txt
+    Alias /favicon.ico  /home/niels/www/meta/nohi/extra/favicon.ico
+    Alias /favicon.png  /home/niels/www/meta/nohi/extra/favicon.png
+    Alias /atom.xml     /home/niels/www/meta/nohi/extra/atom.xml
+    Alias /feedicon.png /home/niels/www/meta/nohi/extra/feedicon.png
+    Alias /feedlogo.png /home/niels/www/meta/nohi/extra/feedlogo.png
+    Alias /static       /home/niels/www/meta/nohi/static
+    Alias /heavy        /home/niels/www/meta/nohi/heavy
+
+    <Directory /home/niels/www/meta/nohi>
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+    WSGIDaemonProcess metanohi.name processes=2 threads=30 display-name=%{GROUP}
+    WSGIProcessGroup metanohi.name
+
+    WSGIScriptAlias / /home/niels/www/meta/nohi/nohi.wsgi
+
+    ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+    <Directory "/usr/lib/cgi-bin">
+        AllowOverride None
+        Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+    LogLevel warn
+	ErrorLog ${APACHE_LOG_DIR}/metanohi.name-error.log
+	CustomLog ${APACHE_LOG_DIR}/metanohi.name-access.log combined
+
+
+</VirtualHost>
diff --git a/scripts/hook_new.sh b/scripts/hook_new.sh
index e101e4d..daac73a 100755
--- a/scripts/hook_new.sh
+++ b/scripts/hook_new.sh
@@ -8,5 +8,5 @@ git pull
 cd ~/www/meta/nohi
 
 git pull
-git feed
+mege feed
 mege restart