summaryrefslogtreecommitdiff
path: root/apache2/sites-available
diff options
context:
space:
mode:
authorJonas <dr@jones.dk>2013-11-15 22:47:23 +0100
committerJonas <dr@jones.dk>2013-11-15 22:47:23 +0100
commit765a08104a3f9085f8c9b8f40dad082c8146b76b (patch)
tree4f2b56e1a4f3495bfb818e9a20bb6d00c1068411 /apache2/sites-available
parent4c7c7b0137c4e443eed29e75f9d6267a35c90488 (diff)
Add uWSGI-based example MoinMoin setup, replacing earlier Apache2-specific setup.
Diffstat (limited to 'apache2/sites-available')
l---------[-rw-r--r--]apache2/sites-available/wiki.secure-example.com73
1 files changed, 1 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