5 files changed, 89 insertions, 72 deletions
diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com
index 45fe79d..45a2897 100644..120000
--- a/apache2/sites-available/wiki.secure-example.com
+++ b/apache2/sites-available/wiki.secure-example.com
@@ -1,72 +1 @@
-<VirtualHost *:443>
-	ServerName wiki.example.com
-	ServerAdmin webmaster@example.com
-	DocumentRoot /usr/share/moin/htdocs
-
-	Include conf.d/local-ssl.conf
-
-#	<Location />
-#		Options	+ExecCGI
-#	</Location>
-
-	<Directory /usr/share/moin/server/>
-		# Use mod_python as handler
-		SetHandler python-program
-
-		# set the path to the MoinMoin package and to the wikiconfig.py
-		PythonPath "['/etc/moin']+sys.path"
-
-		# choose the ModPy Request class as handler
-		PythonHandler MoinMoin.request::RequestModPy.run
-
-#		PythonOption Location /moin
-	</Directory>
-
-	# Use default themes
-	Alias /wiki/ /usr/share/moin/htdocs/
-
-        AcceptPathInfo On
-
-	RewriteEngine On
-	RewriteLogLevel 1
-	RewriteRule ^/moin(/(.*))? /$2 [last,R]
-	RewriteRule ^/wiki/ - [last]
-	RewriteRule ^/robots.txt - [last]
-	RewriteRule ^/favicon.ico - [last]
-#	RewriteRule ^/?(.*) /usr/share/moin/server/moin.cgi/$1 [last,type=application/x-httpd-cgi]
-#	RewriteRule ^/?(.*) /var/local/moin/server/moinmodpy.py$1 [last,type=application/x-python-code]
-	RewriteRule ^/?(.*) /usr/share/moin/server/moinmodpy.py/$1 [last,type=application/x-python-code]
-#	RewriteRule ^/?(.*) /var/local/moin/server/moinmodpy.py$1 [last]
-#	RewriteRule ^/?(.*) moin/$1 [last,type=application/x-python-code]
-
-	ErrorLog ${APACHE_LOG_DIR}/wiki.example.com-error.log
-	CustomLog ${APACHE_LOG_DIR}/wiki.example.com-access.log combined
-</VirtualHost>
-<VirtualHost *:443>
-	ServerName www.wiki.example.com:443
-	ServerName wiki:443
-	ServerName *.wiki:443
-
-	Include conf.d/local-ssl.conf
-	Include conf.d/local-log-origin.conf
-
-	RewriteEngine On
-	RewriteRule / https://wiki.example.com/ [R]
-#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
-
-	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
-</VirtualHost>
-<VirtualHost *:80>
-	ServerName wiki.example.com
-	ServerAlias *.wiki.example.com
-	ServerAlias wiki
-	ServerAlias *.wiki
-
-	Include conf.d/local-log-origin.conf
-
-	RewriteEngine On
-	RewriteRule / https://wiki.example.com/ [R]
-#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
-
-	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
-</VirtualHost>
+../../moin/apache2/sites-available/wiki.secure-example.com
+\ No newline at end of file
diff --git a/moin/apache2/sites-available/wiki.secure-example.com b/moin/apache2/sites-available/wiki.secure-example.com
new file mode 100644
index 0000000..5ccca1b
--- /dev/null
+++ b/moin/apache2/sites-available/wiki.secure-example.com
@@ -0,0 +1,43 @@
+<VirtualHost *:443>
+	ServerName wiki.example.com
+	ServerAdmin webmaster@example.com
+	DocumentRoot /usr/share/moin/htdocs
+
+	Include conf.d/local-ssl.conf
+
+	<Location />
+		SetHandler uwsgi-handler
+		uWSGISocket /run/uwsgi/app/local-moin/socket
+	</Location>
+
+	ErrorLog ${APACHE_LOG_DIR}/wiki.example.com-error.log
+	CustomLog ${APACHE_LOG_DIR}/wiki.example.com-access.log combined
+</VirtualHost>
+<VirtualHost *:443>
+	ServerName www.wiki.example.com:443
+	ServerName wiki:443
+	ServerName *.wiki:443
+
+	Include conf.d/local-ssl.conf
+	Include conf.d/local-log-origin.conf
+
+	RewriteEngine On
+	RewriteRule / https://wiki.example.com/ [R]
+#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
+
+	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
+</VirtualHost>
+<VirtualHost *:80>
+	ServerName wiki.example.com
+	ServerAlias *.wiki.example.com
+	ServerAlias wiki
+	ServerAlias *.wiki
+
+	Include conf.d/local-log-origin.conf
+
+	RewriteEngine On
+	RewriteRule / https://wiki.example.com/ [R]
+#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
+
+	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
+</VirtualHost>
diff --git a/moin/moin.wsgi b/moin/moin.wsgi
new file mode 100644
index 0000000..789ac94
--- /dev/null
+++ b/moin/moin.wsgi
@@ -0,0 +1,9 @@
+# -*- coding: iso-8859-1 -*-
+
+import sys, os
+
+sys.path.insert(0, '/etc/moin')
+
+from MoinMoin.web.serving import make_application
+
+application = make_application(shared=False)
diff --git a/moin/uwsgi/apps-available/local-moin.ini b/moin/uwsgi/apps-available/local-moin.ini
new file mode 100644
index 0000000..2be20c0
--- /dev/null
+++ b/moin/uwsgi/apps-available/local-moin.ini
@@ -0,0 +1,35 @@
+[uwsgi]
+single-interpreter = True
+plugins = python
+
+master = True
+workers = 1
+threads = 10
+vacuum = True
+max-requests = 1000
+
+uid = www-cee
+umask = 007
+
+wsgi-file = /usr/local/etc/moin/moin.wsgi
+
+static-map = /moin_static194/=/usr/share/moin/htdocs/
+static-map = /moin_static194/applets/FCKeditor/=/usr/share/fckeditor/
+static-map = /favicon.ico=/usr/share/moin/htdocs/favicon.ico
+static-map = /robots.txt=/usr/share/moin/htdocs/robots.txt
+
+#memory-report = True
+
+# set workers/threads, enable memory-report for a little while, consult
+# logfile for sensible threshold for reload-on-rss, and only then enable
+#reload-on-rss = 40
+
+# merge identical memory pages after every 10th request
+# more info at <http://uwsgi-docs.readthedocs.org/en/latest/KSM.html>
+ksm = 10
+
+# trick found at http://wiki.nginx.org/MoinMoin
+include uwsgi_params
+uwsgi_param SCRIPT_NAME /;
+uwsgi_modifier1 30;
+ignore-script-name = true
diff --git a/uwsgi/apps-available/local-moin.ini b/uwsgi/apps-available/local-moin.ini
new file mode 120000
index 0000000..4673431
--- /dev/null
+++ b/uwsgi/apps-available/local-moin.ini
@@ -0,0 +1 @@
+../../moin/uwsgi/apps-available/local-moin.ini
+\ No newline at end of file