rpms/moin/devel .cvsignore, 1.14, 1.15 README-rpm, 1.2, 1.3 moin.spec, 1.24, 1.25 sources, 1.14, 1.15

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/moin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16574

Modified Files:
	.cvsignore README-rpm moin.spec sources 
Log Message:
* Tue Apr 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-1
- Update to 1.8.2
- Update README-rpm to include mod_wsgi instructions
- Fixes CVE-2008-3381



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	24 Apr 2008 09:58:38 -0000	1.14
+++ .cvsignore	14 Apr 2009 20:37:44 -0000	1.15
@@ -1 +1 @@
-moin-1.6.3.tar.gz
+moin-1.8.2.tar.gz


Index: README-rpm
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/README-rpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README-rpm	1 Sep 2005 07:47:44 -0000	1.2
+++ README-rpm	14 Apr 2009 20:37:44 -0000	1.3
@@ -1,38 +1,124 @@
-Steps to setup moin for your apache server:
+Steps to setup Moin for your Apache server
+==========================================
+
+These instructions are only an example, please refer to the upstream-supplied
+documentation files in this package, http://moinmo.in/ and
+http://code.google.com/p/modwsgi/ for more instructions on setting up Moin and
+mod_wsgi.
+
+It's very important to read the documentation in /usr/share/doc/moin-*,
+especially when upgrading to a newer version of this package! 'rpm -qd moin'
+should give a list of the documentation files in this package.
+
+Set up a wiki instance
+----------------------
+
+First you need a wiki instance, which can be set up as follows:
+
+#!/bin/sh
+DESTDIR=/var/www/mywiki
+mkdir -p $DESTDIR
+cp -a /usr/share/moin/{data,underlay,htdocs} $DESTDIR
+chown -R apache:apache $DESTDIR/{data,underlay,htdocs}
+
+These instructions also copy the htdocs directory, which includes the static
+content, such as images, themes, favicon.ico and robots.txt. You can also use
+the /usr/share/moin/htdocs directory, but that prevents you from editing the
+favicon or robots.txt or adding new themes. Another option is to symlink
+the files and directories you can use from /usr/share/moin/htdocs and only
+copy the files you need to edit.
+
+Set up Moin using mod_wsgi
+--------------------------
+
+This is the recommended way of using Moin with Apache. First install the
+mod_wsgi package from Fedora's package repository.
+
+Remember to change the line Alias /moin_static182/ "$DESTDIR/htdocs/"
+according to the Moin version. For example 182 is for Moin version 1.8.2.
+
+#!/bin/sh
+DESTDIR=/var/www/mywiki
+mkdir -p $DESTDIR/config
+cp -a /usr/share/moin/server/moin.wsgi $DESTDIR/config
+cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/config
+cat > /etc/httpd/conf.d/mywiki.conf <<EOF
+# this is for icons, css, js (and must match url_prefix from wiki config):
+Alias /moin_static182/ "$DESTDIR/htdocs/"
+<Directory "$DESTDIR/htdocs/">
+    Options Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+# this is the URL http://servername/mywiki/ you will use later to invoke moin:
+WSGIScriptAlias /mywiki "$DESTDIR/config/moin.wsgi"
+<Directory "$DESTDIR/config">
+    Options None
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+# The WSGI socket needs to be somewhere Apache has access to
+WSGISocketPrefix /var/run/moin-wsgi
+# in case you want your wiki under the root url (http://servername/), use this instead:
+#Alias /robots.txt $DESTDIR/htdocs/robots.txt
+#Alias /favicon.ico $DESTDIR/htdocs/favicon.ico
+#WSGIScriptAlias / $DESTDIR/config/moin.wsgi
+# create some wsgi daemons - use someuser.somegroup same as your data_dir:
+WSGIDaemonProcess moin user=apache group=apache processes=5 threads=10 maximum-requests=1000 umask=0007 display-name=wsgi-moin
+# use the daemons we defined above to process requests!
+WSGIProcessGroup moin
+# This is required if you plan to use HTTP authorization. Without it the user name won't
+# be passed to MoinMoin. 
+#WSGIPassAuthorization On
+EOF
+
+Edit /var/www/mywiki/config/moin.wsgi and add
+sys.path.insert(0, '/var/www/mywiki/config') after the comment lines.
+
+Edit /var/www/mywiki/config/wikiconfig.py to have something like the
+following (it's Python, spaces and quotes matter):
+    data_dir = '/var/www/mywiki/data/'
+    data_underlay_dir = '/var/www/mywiki/underlay/'
+
+Finally do a "service httpd restart".
+
+Set up Moin using CGI
+---------------------
+
+This is quite slow, using mod_wsgi is recommended.
+
+Remember to change the line Alias /moin_static182/ "$DESTDIR/htdocs/"
+according to the Moin version. For example 182 is for Moin version 1.8.2.
 
 #!/bin/sh
 DESTDIR=/var/www/mywiki
 mkdir -p $DESTDIR/cgi-bin
-cp -a /usr/share/moin/{data,underlay} $DESTDIR
 cp -a /usr/share/moin/server/moin.cgi $DESTDIR/cgi-bin
 cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin
-chown -R apache:apache $DESTDIR/{data,underlay}
 cat > /etc/httpd/conf.d/mywiki.conf <<EOF
 ScriptAlias /mywiki "$DESTDIR/cgi-bin/moin.cgi"
 <Directory "$DESTDIR/cgi-bin/">
-    Options Indexes FollowSymLinks ExecCGI
+    Options ExecCGI
     AllowOverride None
     Order allow,deny
     Allow from all
 </Directory>
-# To use mod_pyton disable all above, enable the following lines and
-# also change wikiconfig.py to have absolute paths for data/underlay dirs.
-#<Location /mywiki>
-#    SetHandler python-program
-#    PythonPath "['$DESTDIR/cgi-bin'] + sys.path"
-#    PythonHandler MoinMoin.request::RequestModPy.run
-#</Location>
-Alias /wiki/ "/usr/share/moin/htdocs/"
-<Directory "/usr/share/moin/htdocs/">
-    Options Indexes FollowSymLinks
+Alias /moin_static182 "$DESTDIR/htdocs/"
+<Directory "$DESTDIR/htdocs/">
+    Options Indexes
     AllowOverride None
     Order allow,deny
     Allow from all
 </Directory>
 EOF
 
+Edit /etc/httpd/conf/httpd.conf to include "AddHandler cgi-script .cgi".
+Edit /var/www/mywiki/cgi-bin/wikiconfig.py to have something like the
+following (it's Python, spaces and quotes matter):
+    data_dir = '/var/www/mywiki/data/'
+    data_underlay_dir = '/var/www/mywiki/underlay/'
 
-Then edit /etc/httpd/conf/httpd.conf to include "AddHandler cgi-script .cgi"
-and edit /var/www/mywiki/cgi-bin/wikiconfig.py and finally do
-a "service httpd restart".
+Finally do a "service httpd restart".
 


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/moin.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moin.spec	26 Feb 2009 02:19:21 -0000	1.24
+++ moin.spec	14 Apr 2009 20:37:45 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.6.3
-Release: 3%{?dist}
+Version: 1.8.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
@@ -39,17 +39,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README-rpm docs/CHANGES* docs/INSTALL.html docs/README.migration
+%doc README README-rpm docs/CHANGES* docs/INSTALL.html docs/README.migration docs/UPDATE.html
 %doc docs/licenses/
 %{_bindir}/moin
 %if 0%{?fedora} >= 9
 %{python_sitelib}/moin-*.egg-info/
 %endif
 %{python_sitelib}/MoinMoin/
+%{python_sitelib}/jabberbot/
 %{_datadir}/moin/
 
 
 %changelog
+* Tue Apr 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-1
+- Update to 1.8.2
+- Update README-rpm to include mod_wsgi instructions
+- Fixes CVE-2008-3381
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	24 Apr 2008 09:58:38 -0000	1.14
+++ sources	14 Apr 2009 20:37:45 -0000	1.15
@@ -1 +1 @@
-081aa0dd82b4220c8ff28a9a751bad7c  moin-1.6.3.tar.gz
+b3ced56bbe09311a7c56049423214cdb  moin-1.8.2.tar.gz