SOURCES: moinmoin-config.patch - update to 1.5.4 by Kamil Jakubowski
glen
glen at pld-linux.org
Tue Jul 11 16:39:05 CEST 2006
Author: glen Date: Tue Jul 11 14:39:05 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 1.5.4 by Kamil Jakubowski
---- Files affected:
SOURCES:
moinmoin-config.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/moinmoin-config.patch
diff -u SOURCES/moinmoin-config.patch:1.2 SOURCES/moinmoin-config.patch:1.3
--- SOURCES/moinmoin-config.patch:1.2 Sat Jun 3 11:43:47 2006
+++ SOURCES/moinmoin-config.patch Tue Jul 11 16:39:00 2006
@@ -1,128 +1,119 @@
---- moin-1.5.3/wiki/server/moin 2006-06-02 22:48:10.541318318 +0300
-+++ moin-1.5.0.config/wiki/server/moin 2006-06-03 00:26:57.964270527 +0300
-@@ -10,8 +10,8 @@
- """
+diff -urN moin-1.5.4/wiki/config/wikiconfig.py moin-1.5.4.new/wiki/config/wikiconfig.py
+--- moin-1.5.4/wiki/config/wikiconfig.py 2006-06-25 15:27:26.000000000 +0200
++++ moin-1.5.4.new/wiki/config/wikiconfig.py 2006-07-10 23:53:23.245458500 +0200
+@@ -65,14 +65,14 @@
+
+ # Where your mutable wiki pages are. You want to make regular
+ # backups of this directory.
+- data_dir = './data/'
++ data_dir = '/var/lib/moin/data/'
+
+ # Where read-only system and help page are. You might want to share
+ # this directory between several wikis. When you update MoinMoin,
+ # you can safely replace the underlay directory with a new one. This
+ # directory is part of MoinMoin distribution, you don't have to
+ # backup it.
+- data_underlay_dir = './underlay/'
++ data_underlay_dir = '/var/lib/moin/underlay/'
+
+ # Location of your STATIC files (css/png/js/...) - you must NOT use the
+ # same for invoking moin.cgi (or, in general, the moin code).
+diff -urN moin-1.5.4/wiki/htdocs/index.html moin-1.5.4.new/wiki/htdocs/index.html
+--- moin-1.5.4/wiki/htdocs/index.html 2006-05-11 18:24:01.000000000 +0200
++++ moin-1.5.4.new/wiki/htdocs/index.html 2006-07-10 23:52:36.442533500 +0200
+@@ -1,11 +1,11 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+ <html>
+ <head>
+- <meta http-equiv="refresh" content="0;URL=moin.cgi/">
++ <meta http-equiv="refresh" content="0;URL=./">
+ </head>
+
+ <body bgcolor="#FFFFFF" text="#000000">
+- Click <a href="moin.cgi">here</a> to get to the FrontPage.
++ Click <a href="./">here</a> to get to the FrontPage.
+ </body>
+ </html>
+
+diff -urN moin-1.5.4/wiki/server/moin moin-1.5.4.new/wiki/server/moin
+--- moin-1.5.4/wiki/server/moin 2006-06-25 18:19:54.000000000 +0200
++++ moin-1.5.4.new/wiki/server/moin 2006-07-10 23:46:23.495225750 +0200
+@@ -16,6 +16,7 @@
# Add the path to moin.py directory
--## import sys
--## sys.path.insert(0, '/path/to/moin')
-+import sys
+ ## sys.path.insert(0, '/path/to/moin')
+sys.path.insert(0, '/usr/share/moin/server')
from MoinMoin.server import daemon
from moin import Config, run
---- moin-1.5.3/wiki/server/moin.cgi 2006-06-02 22:48:10.541318318 +0300
-+++ moin-1.5.0.config/wiki/server/moin.cgi 2006-06-03 00:27:04.854425068 +0300
-@@ -12,8 +12,7 @@
- import sys
+diff -urN moin-1.5.4/wiki/server/moin.cgi moin-1.5.4.new/wiki/server/moin.cgi
+--- moin-1.5.4/wiki/server/moin.cgi 2006-06-25 15:31:27.000000000 +0200
++++ moin-1.5.4.new/wiki/server/moin.cgi 2006-07-10 23:47:26.083137250 +0200
+@@ -17,7 +17,7 @@
# Path of the directory where wikiconfig.py is located.
--# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
+ # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
-sys.path.insert(0, '/path/to/wikiconfig')
+sys.path.insert(0, '/etc/webapps/moinmoin')
- # Path to MoinMoin package, needed if you installed with --prefix=PREFIX
- # or if you did not use setup.py.
---- moin-1.5.3/wiki/server/moin.fcg 2006-06-02 22:48:10.541318318 +0300
-+++ moin-1.5.0.config/wiki/server/moin.fcg 2006-06-03 00:25:09.401835496 +0300
-@@ -12,8 +12,7 @@
- import sys
+ # Path of the directory where farmconfig.py is located (if different).
+ ## sys.path.insert(0, '/path/to/farmconfig')
+diff -urN moin-1.5.4/wiki/server/moin.fcg moin-1.5.4.new/wiki/server/moin.fcg
+--- moin-1.5.4/wiki/server/moin.fcg 2006-06-25 15:31:52.000000000 +0200
++++ moin-1.5.4.new/wiki/server/moin.fcg 2006-07-10 23:47:46.328402500 +0200
+@@ -17,7 +17,7 @@
# Path of the directory where wikiconfig.py is located.
--# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
+ # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
-sys.path.insert(0, '/path/to/wikiconfig')
+sys.path.insert(0, '/etc/webapps/moinmoin')
- # Path to MoinMoin package, needed if you installed with --prefix=PREFIX
- # or if you did not use setup.py.
---- moin-1.5.3/wiki/server/moin.py 2006-06-02 22:48:10.541318318 +0300
-+++ moin-1.5.0.config/wiki/server/moin.py 2006-06-03 00:25:14.341946305 +0300
-@@ -11,8 +11,7 @@
- import sys
+ # Path of the directory where farmconfig is located (if different).
+ ## sys.path.insert(0, '/path/to/farmconfig')
+diff -urN moin-1.5.4/wiki/server/moinmodpy.py moin-1.5.4.new/wiki/server/moinmodpy.py
+--- moin-1.5.4/wiki/server/moinmodpy.py 2006-06-25 15:32:57.000000000 +0200
++++ moin-1.5.4.new/wiki/server/moinmodpy.py 2006-07-10 23:49:12.673798750 +0200
+@@ -37,7 +37,7 @@
# Path of the directory where wikiconfig.py is located.
--# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
+ # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
-sys.path.insert(0, '/path/to/wikiconfig')
+sys.path.insert(0, '/etc/webapps/moinmoin')
- # Path to MoinMoin package, needed if you installed with --prefix=PREFIX
- # or if you did not use setup.py.
---- moin-1.5.3/wiki/server/moinmodpy.py 2006-06-02 22:48:10.551318541 +0300
-+++ moin-1.5.0.config/wiki/server/moinmodpy.py 2006-06-03 00:25:23.722156705 +0300
-@@ -32,8 +32,7 @@
- import sys
+ # Path of the directory where farmconfig is located (if different).
+ ## sys.path.insert(0, '/path/to/farmconfig')
+diff -urN moin-1.5.4/wiki/server/moin.py moin-1.5.4.new/wiki/server/moin.py
+--- moin-1.5.4/wiki/server/moin.py 2006-06-25 15:32:14.000000000 +0200
++++ moin-1.5.4.new/wiki/server/moin.py 2006-07-10 23:48:03.413470250 +0200
+@@ -16,7 +16,7 @@
# Path of the directory where wikiconfig.py is located.
--# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
+ # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
-sys.path.insert(0, '/path/to/wikiconfig')
+sys.path.insert(0, '/etc/webapps/moinmoin')
- # Path to MoinMoin package, needed if you installed with --prefix=PREFIX
- # or if you did not use setup.py.
---- moin-1.5.3/wiki/server/mointwisted 2006-06-02 22:48:10.551318541 +0300
-+++ moin-1.5.0.config/wiki/server/mointwisted 2006-06-03 00:27:17.954718893 +0300
-@@ -7,8 +7,8 @@
- """
+ # Path of the directory where farmconfig is located (if different).
+ ## sys.path.insert(0, '/path/to/farmconfig')
+diff -urN moin-1.5.4/wiki/server/mointwisted moin-1.5.4.new/wiki/server/mointwisted
+--- moin-1.5.4/wiki/server/mointwisted 2006-06-25 18:20:44.000000000 +0200
++++ moin-1.5.4.new/wiki/server/mointwisted 2006-07-10 23:50:03.420970250 +0200
+@@ -13,6 +13,7 @@
# Add the path to mointwisted.py directory
--## import sys
--## sys.path.insert(0, '/path/to/mointwisted')
-+import sys
+ ## sys.path.insert(0, '/path/to/mointwisted')
+sys.path.insert(0, '/usr/share/moin/server')
import os
-@@ -24,4 +24,4 @@
-
-
- script = TwistedScript(Config.name, None)
--script.run()
-\ No newline at end of file
-+script.run()
---- moin-1.5.3/wiki/server/mointwisted.py 2006-06-02 22:48:10.551318541 +0300
-+++ moin-1.5.0.config/wiki/server/mointwisted.py 2006-06-03 00:25:49.782741246 +0300
-@@ -13,8 +13,7 @@
- import sys
+diff -urN moin-1.5.4/wiki/server/mointwisted.py moin-1.5.4.new/wiki/server/mointwisted.py
+--- moin-1.5.4/wiki/server/mointwisted.py 2006-06-25 15:34:03.000000000 +0200
++++ moin-1.5.4.new/wiki/server/mointwisted.py 2006-07-10 23:51:27.086199000 +0200
+@@ -18,7 +18,7 @@
# Path of the directory where wikiconfig.py is located.
--# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
+ # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
-sys.path.insert(0, '/path/to/wikiconfig')
+sys.path.insert(0, '/etc/webapps/moinmoin')
- # Path to MoinMoin package, needed if you installed with --prefix=PREFIX
- # or if you did not use setup.py
---- moin-1.5.3/wiki/htdocs/index.html~ 2005-09-22 19:22:10.000000000 +0300
-+++ moin-1.5.3/wiki/htdocs/index.html 2006-06-03 00:52:26.798560688 +0300
-@@ -1,11 +1,11 @@
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
- <html>
- <head>
-- <meta http-equiv="refresh" content="0;URL=moin.cgi/">
-+ <meta http-equiv="refresh" content="0;URL=./">
- </head>
-
- <body bgcolor="#FFFFFF" text="#000000">
-- Click <a href="moin.cgi">here</a> to get to the FrontPage.
-+ Click <a href="./">here</a> to get to the FrontPage.
- </body>
- </html>
-
---- moin-1.5.3/wiki/config/wikiconfig.py 2006-02-04 23:20:20.000000000 +0200
-+++ moin-1.5.3/wiki/config/wikiconfig.py 2006-06-03 12:24:58.468604858 +0300
-@@ -65,14 +65,14 @@
-
- # Where your mutable wiki pages are. You want to make regular
- # backups of this directory.
-- data_dir = './data/'
-+ data_dir = '/var/lib/moin/data/'
-
- # Where read-only system and help page are. You might want to share
- # this directory between several wikis. When you update MoinMoin,
- # you can safely replace the underlay directory with a new one. This
- # directory is part of MoinMoin distribution, you don't have to
- # backup it.
-- data_underlay_dir = './underlay/'
-+ data_underlay_dir = '/var/lib/moin/underlay/'
-
- # This must be '/wiki' for twisted and standalone. For CGI, it should
- # match your Apache Alias setting.
+ # Path to the directory where farmconfig is located (if different).
+ ## sys.path.insert(0, '/path/to/farmconfig')
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/moinmoin-config.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list