rpms/moin/devel .cvsignore, 1.17, 1.18 README-rpm, 1.3, 1.4 moin.spec, 1.31, 1.32 sources, 1.17, 1.18
Ville-Pekka Vainio
vpv at fedoraproject.org
Sun Dec 27 22:40:11 UTC 2009
Author: vpv
Update of /cvs/pkgs/rpms/moin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31296
Modified Files:
.cvsignore README-rpm moin.spec sources
Log Message:
* Mon Dec 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.9.0-1
- 1.9.0
- Don't remove any FCKeditor directories, all known security issues in it
should be fixed by now
- Updated README-rpm, only give an example on mod_wsgi configuration, Moin is
a pure WSGI application now
- Change the Python magic encoding comment in wiki/config/wikiconfig.py to
UTF-8
- Change url_prefix_static in wiki/config/wikiconfig.py to better suit the
configuration example in README-rpm, where the wiki is served from
example.tld/mywiki
- wiki/server/moin.wsgi adds the directory it is in to the Python search path,
as the wikiconfig.py file will be in the same directory as moin.wsgi if Moin
is set up according to the example in README-rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore 15 Sep 2009 13:36:28 -0000 1.17
+++ .cvsignore 27 Dec 2009 22:40:10 -0000 1.18
@@ -1 +1 @@
-moin-1.8.5.tar.gz
+moin-1.9.0.tar.gz
Index: README-rpm
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/README-rpm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README-rpm 14 Apr 2009 20:37:44 -0000 1.3
+++ README-rpm 27 Dec 2009 22:40:10 -0000 1.4
@@ -10,6 +10,15 @@ It's very important to read the document
especially when upgrading to a newer version of this package! 'rpm -qd moin'
should give a list of the documentation files in this package.
+Moin is a pure WSGI application since 1.9.0, this README will guide you
+through a basic setup with Apache and mod_wsgi. Make sure you have the
+mod_wsgi package installed from the Fedora package repository. Refer to the
+Moin website for documentation about setting up Moin with FCGI/SCGI/CGI or
+with other web servers such as lighttpd.
+
+Since 1.9.0 Moin runs a server to serve the static files itself from the path
+defined in the url_prefix_static variable in wikiconfig.py.
+
Set up a wiki instance
----------------------
@@ -18,107 +27,41 @@ First you need a wiki instance, which ca
#!/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.
+cp -a /usr/share/moin/{data,underlay} $DESTDIR
+chown -R apache:apache $DESTDIR/{data,underlay}
-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.
+Set up Moin
+-----------
#!/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
+mkdir -p $DESTDIR
+cp -a /usr/share/moin/server/moin.wsgi $DESTDIR
+cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR
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>
+WSGIScriptAlias /mywiki "$DESTDIR/moin.wsgi"
+
# 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
+#WSGIScriptAlias / $DESTDIR/moin.wsgi
+
+# create some wsgi daemons:
+WSGIDaemonProcess moin user=apache group=apache processes=5 threads=10 maximum-requests=1000 umask=0007 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/server/moin.cgi $DESTDIR/cgi-bin
-cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin
-cat > /etc/httpd/conf.d/mywiki.conf <<EOF
-ScriptAlias /mywiki "$DESTDIR/cgi-bin/moin.cgi"
-<Directory "$DESTDIR/cgi-bin/">
- Options ExecCGI
- AllowOverride None
- Order allow,deny
- Allow from all
-</Directory>
-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/'
-
-Finally do a "service httpd restart".
+The moin.wsgi file adds $DESTDIR to the Python search path, so Python should be
+able to find wikiconfig.py automatically.
+Finally, restart Apache by doing a "service httpd restart".
Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/moin.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- moin.spec 15 Sep 2009 13:36:28 -0000 1.31
+++ moin.spec 27 Dec 2009 22:40:10 -0000 1.32
@@ -2,7 +2,7 @@
Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
Name: moin
-Version: 1.8.5
+Version: 1.9.0
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
@@ -21,9 +21,16 @@ editable web pages.
%prep
%setup -q
-# The filemanager directory included vulnerable code in the past, it shouldn't
-# anymore, but let's remove it just to be sure.
-rm -r wiki/htdocs/applets/FCKeditor/editor/filemanager/
+# Change the encoding to UTF-8, users are likely to edit this file
+sed -i -e 's|coding: iso-8859-1|coding: utf-8|' wiki/config/wikiconfig.py
+# Remove the leading comment from url_prefix_static. The Moin default assumes
+# the wiki is served from the root of the site, change it to better suit the
+# example in README-rpm, in which the wiki is served from
+# example.tld/mywiki
+sed -i -e 's|\(#\)\(url_prefix_static.*\)|\2|' wiki/config/wikiconfig.py
+# Add the directory containing moin.wsgi to the Python search path, as
+# in the README-rpm example these files will be in the same directory.
+sed -i -e "s|#sys.path.insert(0, '/path/to/wikiconfigdir')|sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))|" wiki/server/moin.wsgi
%build
@@ -54,6 +61,21 @@ rm -r wiki/htdocs/applets/FCKeditor/edit
%changelog
+* Mon Dec 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.9.0-1
+- 1.9.0
+- Don't remove any FCKeditor directories, all known security issues in it
+ should be fixed by now
+- Updated README-rpm, only give an example on mod_wsgi configuration, Moin is
+ a pure WSGI application now
+- Change the Python magic encoding comment in wiki/config/wikiconfig.py to
+ UTF-8
+- Change url_prefix_static in wiki/config/wikiconfig.py to better suit the
+ configuration example in README-rpm, where the wiki is served from
+ example.tld/mywiki
+- wiki/server/moin.wsgi adds the directory it is in to the Python search path,
+ as the wikiconfig.py file will be in the same directory as moin.wsgi if Moin
+ is set up according to the example in README-rpm
+
* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
- 1.8.5
- Includes multiple bug fixes, a new FCKeditor version and some new features
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 15 Sep 2009 13:36:28 -0000 1.17
+++ sources 27 Dec 2009 22:40:10 -0000 1.18
@@ -1 +1 @@
-779543d32dacc904c306d5d8ace99207 moin-1.8.5.tar.gz
+2d1a8d5e78961f1e2ce86b6f3df86ba2 moin-1.9.0.tar.gz
More information about the fedora-extras-commits
mailing list