Date: Wed, 14 Apr 2010 12:06:59 +0200 (CEST) From: Janos Mohacsi <janos.mohacsi@bsd.hu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bg1tpt@gmail.com Subject: ports/145690: [PATCH] www/moinmoin: [Add WSGI support] Message-ID: <201004141006.o3EA6xH0039833@skye.ki.iif.hu> Resent-Message-ID: <201004141010.o3EAA2JO040523@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145690
>Category: ports
>Synopsis: [PATCH] www/moinmoin: [Add WSGI support]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 14 10:10:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 7.2-STABLE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD skye.ki.iif.hu 7.2-STABLE FreeBSD 7.2-STABLE #6: Fri Jan 15 13:51:04 CET 2010
>Description:
Add WSGI support to moinmoin - which is recommended usage since version 1.9
Port maintainer (bg1tpt@gmail.com) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- moinmoin-1.9.2_1.patch begins here ---
diff -ruN --exclude=CVS /home/ports/www/moinmoin.orig/Makefile /home/ports/www/moinmoin/Makefile
--- /home/ports/www/moinmoin.orig/Makefile 2010-04-08 14:59:24.000000000 +0200
+++ /home/ports/www/moinmoin/Makefile 2010-04-14 11:48:14.000000000 +0200
@@ -39,13 +39,15 @@
.elif ${MOINTYPE} == "MOD_PYTHON"
.elif ${MOINTYPE} == "CGI"
MOINSCRIPT= ${MOINDIR}/server/moin.cgi
+.elif ${MOINTYPE} == "WSGI"
+MOINSCRIPT= ${MOINDIR}/server/moin.wsgi
.else
-BROKEN= MOINTYPE must be a STANDALONE, FCGI, MOD_PYTHON or CGI.
+BROKEN= MOINTYPE must be a STANDALONE, FCGI, WSGI, MOD_PYTHON or CGI.
.endif
pre-everything::
@${ECHO}
- @${ECHO} "Set MOINTYPE=(CGI|FCGI|STANDALONE) to define"
+ @${ECHO} "Set MOINTYPE=(CGI|FCGI|WSGI|STANDALONE) to define"
@${ECHO} "type of installation. Default is CGI."
@${ECHO} "Use MOINDEST=/path to modify installation destination."
@${ECHO} "Default value for MOINDEST is ${PREFIX}/www/wiki."
diff -ruN --exclude=CVS /home/ports/www/moinmoin.orig/files/pkg-install.in /home/ports/www/moinmoin/files/pkg-install.in
--- /home/ports/www/moinmoin.orig/files/pkg-install.in 2008-12-17 11:34:36.000000000 +0100
+++ /home/ports/www/moinmoin/files/pkg-install.in 2010-04-14 12:04:51.000000000 +0200
@@ -56,6 +56,29 @@
;;
+ "xWSGI")
+
+ echo "Since you chose MOINTYPE=WSGI, you should "
+ echo "add something like that to your Apache configuration."
+ echo ""
+
+ echo ",-----"
+ echo " Alias /moin_static180/ \"$sharedir/htdocs/\""
+ echo " <Directory \"$sharedir/htdocs/\">"
+ echo " Order deny,allow"
+ echo " Allow from all"
+ echo " </Directory>"
+ echo " WSGIScriptAlias /mywiki \"$destdir/moin.wsgi\""
+ echo "#If you use HTTP authorization enable the following also"
+ echo "#WSGIPassAuthorization On"
+ echo " <Directory \"$sharedir/htdocs/\">"
+ echo " Allow from all"
+ echo " </Directory>"
+ echo "\`-----"
+ echo ""
+
+ ;;
+
*)
;;
@@ -84,7 +107,7 @@
echo "If you're installing from package, run these commands."
echo ""
echo "# Choose here one script depending on the type of wiki you"
- echo "# want : moin.py (standalone), moin.fcg (FCGI) or moin.cgi."
+ echo "# want : moin.py (standalone), moin.fcg (FCGI), moin.wsgi (WSGI) or moin.cgi."
echo 'export MOINSCRIPT="moin.cgi"'
echo '# Defaults should be fine but you may want to modify these.'
echo 'export MOINDIR="%%MOINDIR%%"'
--- moinmoin-1.9.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004141006.o3EA6xH0039833>