From 765a08104a3f9085f8c9b8f40dad082c8146b76b Mon Sep 17 00:00:00 2001
From: Jonas <dr@jones.dk>
Date: Fri, 15 Nov 2013 22:47:23 +0100
Subject: Add uWSGI-based example MoinMoin setup, replacing earlier
 Apache2-specific setup.

---
 apache2/sites-available/wiki.secure-example.com | 73 +------------------------
 1 file changed, 1 insertion(+), 72 deletions(-)
 mode change 100644 => 120000 apache2/sites-available/wiki.secure-example.com

(limited to 'apache2/sites-available/wiki.secure-example.com')

diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com
deleted file mode 100644
index 45fe79d..0000000
--- a/apache2/sites-available/wiki.secure-example.com
+++ /dev/null
@@ -1,72 +0,0 @@
-<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>
diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com
new file mode 120000
index 0000000..45a2897
--- /dev/null
+++ b/apache2/sites-available/wiki.secure-example.com
@@ -0,0 +1 @@
+../../moin/apache2/sites-available/wiki.secure-example.com
\ No newline at end of file
-- 
cgit v1.2.3