Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 37 insertions, 0 deletions

diff --git a/archweb.wsgi b/archweb.wsgi
new file mode 100644
index 00000000..f8de2b49
--- /dev/null
+++ b/archweb.wsgi
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+import os
+import sys
+import site
+
+base_path = "/srv/http/archweb"
+
+site.addsitedir('/srv/http/archweb-env/lib/python2.7/site-packages')
+sys.path.insert(0, base_path)
+
+os.environ['DJANGO_SETTINGS_MODULE'] = "settings"
+
+os.chdir(base_path)
+
+using_newrelic = False
+try:
+    key_path = os.path.join(base_path, "newrelic.key")
+    if os.path.exists(key_path):
+        with open(key_path) as keyfile:
+            key = keyfile.read().strip()
+        os.environ["NEW_RELIC_LICENSE_KEY"] = key
+
+    import newrelic.agent
+    from newrelic.api.exceptions import ConfigurationError
+    try:
+        newrelic.agent.initialize(os.path.join(base_path, "newrelic.ini"))
+        using_newrelic = True
+    except ConfigurationError:
+        pass
+except ImportError:
+    pass
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+
+if using_newrelic:
+    application = newrelic.agent.wsgi_application()(application)