From 765a08104a3f9085f8c9b8f40dad082c8146b76b Mon Sep 17 00:00:00 2001 From: Jonas Date: Fri, 15 Nov 2013 22:47:23 +0100 Subject: Add uWSGI-based example MoinMoin setup, replacing earlier Apache2-specific setup. --- .../sites-available/wiki.secure-example.com | 43 ++++++++++++++++++++++ moin/moin.wsgi | 9 +++++ moin/uwsgi/apps-available/local-moin.ini | 35 ++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 moin/apache2/sites-available/wiki.secure-example.com create mode 100644 moin/moin.wsgi create mode 100644 moin/uwsgi/apps-available/local-moin.ini (limited to 'moin') 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 @@ + + ServerName wiki.example.com + ServerAdmin webmaster@example.com + DocumentRoot /usr/share/moin/htdocs + + Include conf.d/local-ssl.conf + + + SetHandler uwsgi-handler + uWSGISocket /run/uwsgi/app/local-moin/socket + + + ErrorLog ${APACHE_LOG_DIR}/wiki.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/wiki.example.com-access.log combined + + + 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 + + + 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 + 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 +ksm = 10 + +# trick found at http://wiki.nginx.org/MoinMoin +include uwsgi_params +uwsgi_param SCRIPT_NAME /; +uwsgi_modifier1 30; +ignore-script-name = true -- cgit v1.2.3