[RFC] moinmoin update to 1.3.1

[Sam Nilsson]

Josef El-Rayes wrote:
> i modified the Makefile according to your information.
> i took a default apache2 config, added your alias, and
> the port copies it into $EXAMPLESDIR after
> installation, so people can take it as a help when
> setting up this kind of moinmoin instance.

This is nice, but I find it very confusing to include all of the default 
options and comments in the apache conf file. Since apache already 
installs a default file itself, we really just need to know what needs 
to be added or changed. I am submitting the following two files pasted 
here in their entirety for consideration to replace the examples that 
you included in the tarball:

---- /usr/ports/www/moinmoin/files/httpd-cgi.conf ----
# Example httpd.conf configurations for running moinmoin as a CGI script
#
# To install your moinmoin instance into the web server's document root,
# add something like the following to apache's httpd.conf file
#

DocumentRoot "/usr/local/www/wiki"
<Directory "/usr/local/www/wiki">
     AllowOverride None
     Options None
     Order allow,deny
     Allow from all
     Options ExecCGI
</Directory>
Alias /wiki/ "/usr/local/share/moin/htdocs/"
<Directory "/usr/local/share/moin/htdocs/">
Allow from all
</Directory>

#
# To install your instance under /moinmoin, try this:
#

Alias /moinmoin/ "/usr/local/www/wiki/"
<Directory "/usr/local/www/wiki">
     AllowOverride None
     Options None
     Order allow,deny
     Allow from all
     Options ExecCGI
</Directory>
Alias /wiki/ "/usr/local/share/moin/htdocs/"
<Directory "/usr/local/share/moin/htdocs/">
Allow from all
</Directory>

---- /usr/ports/www/moinmoin/files/httpd-mod_python.conf ----
# Example httpd.conf configuration for running moinmoin under mod_python
#
# To install your moinmoin instance under /moinmoin, add something like
# the following to apache's httpd.conf file:
#

Alias /moinmoin/ "/usr/local/www/wiki/"
<Location "/moinmoin/">
         SetHandler python-program
         PythonPath "['/usr/local/www/wiki'] + sys.path"
         PythonHandler MoinMoin.request::RequestModPy.run
         PythonAutoReload Off
         PythonDebug Off
</Location>

Alias /wiki/ "/usr/local/share/moin/htdocs/"
<Directory "/usr/local/share/moin/htdocs/">
         Allow from all
</Directory>


----

I have also attached a patch for the Makefile which adds some echo 
statements and such.

My only points of concern are:

1. At the end of make install or make instance, the following bare text 
is printed (minus the Start and End lines):

--Start--
echo "A sample apache config file, httpd-cgi.conf has been"
A sample apache config file, httpd-cgi.conf has been
echo "installed into /usr/local/share/examples/moinmoin."
installed into /usr/local/share/examples/moinmoin.
echo
--End--

I'm not sure what is going on with the duplicate lines. Maybe something 
in the moinmoin installer. Not a big deal, but not quite right either.

2. When doing a make install or make instance, if an instance already 
exists in MOINDEST, the data files, underlay files and wikiconfig.py 
files are overwritten. Maybe we should emit a warning and refuse to 
install an instance if the directory exists and is not empty?? I'm a 
real newbie when it comes to moinmoin, ports and Makefiles, so I 
wouldn't be the one to do it.

Anyway, if you or someone else can't or doesn't want to mess with the 
instance install issue, I'm still perfectly happy with the moinmoin port.

Thanks for making this port happen!

- Sam Nilsson
-------------- next part --------------
--- Makefile.orig	Sun Jan  2 14:59:58 2005
+++ Makefile	Sun Jan  2 15:41:24 2005
@@ -28,12 +28,14 @@
 pre-everything::
 	@# Give some instructions
 	@${ECHO}
-	@${ECHO} "Set MOINTYPE=(CGI|FCGI|STANDALONE) to define"
+	@${ECHO} "Set MOINTYPE=(CGI|FCGI|MOD_PYTHON|STANDALONE) to define"
 	@${ECHO} "type of installation. Default is CGI."
+	@${ECHO}
 	@${ECHO} "Use MOINDEST=/path to modify installation destination."
+	@${ECHO} "Default MOINDEST is ${PREFIX}/www/wiki"
 	@${ECHO}
-	@${ECHO} "To get correct permissions, please set CGIUSER, CGIGROUP"
-	@${ECHO} "per default it is set to www."
+	@${ECHO} "Set CGIUSER and CGIGROUP to the correct permissions"
+	@${ECHO} "for your web server. Default CGIUSER is www CGIGROUP is www."
 	@${ECHO}
 
 post-install:
@@ -48,6 +50,14 @@
 	${CHMOD} -R u+rw,go-ws ${MOINDEST}/data
 	${CHOWN} -R ${CGIUSER}:${CGIGROUP} ${MOINDEST}/data
 	${CHOWN} -R ${CGIUSER}:${CGIGROUP} ${MOINDEST}/underlay
+
+	@${ECHO}
+	@${ECHO} "A moinmoin instance has been created for you in ${MOINDEST}."
+	@${ECHO} "Please edit the following config file for this instance:"
+	@${ECHO} "${MOINDEST}/wikiconfig.py"
+	@${ECHO}
+	
+
 .if ${MOINTYPE} == "STANDALONE"
 		@# Install standalone instance
 		${INSTALL_SCRIPT} -m 0550 ${MOINDIR}/server/moin.py ${MOINDEST}
@@ -57,11 +67,12 @@
 		${INSTALL_SCRIPT} -m 0550 ${MOINDIR}/server/moin.fcg ${MOINDEST}
 
 .elsif ${MOINTYPE} == "MOD_PYTHON"
+		@# Install example mod_python config
 		${INSTALL_DATA} ${PATCHDIR}/httpd-mod_python.conf ${EXAMPLESDIR}
-		${ECHO}
-		${ECHO} "A sample apache config file, httpd-mod_python.conf has been"
-		${ECHO} "installed into ${EXAMPLESDIR}."
-		${ECHO} 
+		@${ECHO}
+		@${ECHO} "A sample apache config file, httpd-mod_python.conf has been"
+		@${ECHO} "installed into ${EXAMPLESDIR}."
+		@${ECHO} 
 
 .else
 		@# Install CGI instance