Change Request: Fix /wikiold/ (r/o moin)

[Ricky Zhou]

Hi, Rahul reported that /wikiold/ is currently broken, so it looks like
we missed some stuff during the rebuild.  I wasn't sure if this is
considered under the change freeze, so here's the puppet patch I'd like
to apply (also, can somebody confirm that the mount for /srv/web/wiki is correct?):

Thanks,
Ricky


From 7a4f9b64fe100dd4eb7de9ad57c98338bf0dd7f7 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky(a)fedoraproject.org&gt;
Date: Tue, 16 Sep 2008 03:56:43 +0000
Subject: [PATCH] Fix up old moin setup.

---
 configs/web/applications/moin.wsgi      |   11 +++++++++--
 manifests/services/fedoraproject.org.pp |   23 ++++++++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/configs/web/applications/moin.wsgi b/configs/web/applications/moin.wsgi
index 5bd3772..bfd0d86 100644
--- a/configs/web/applications/moin.wsgi
+++ b/configs/web/applications/moin.wsgi
@@ -1,7 +1,14 @@
-#!/usr/bin/python
 import sys
 sys.path.insert(0, '/srv/web/wiki')
 
-from MoinMoin.server.wsgi import moinmoinApp
+import logging
+
+from MoinMoin.server.server_wsgi import WsgiConfig, moinmoinApp
+
+class Config(WsgiConfig):
+    logPath = 'moin.log'
+
+config = Config()
 
 application = moinmoinApp
+
diff --git a/manifests/services/fedoraproject.org.pp
b/manifests/services/fedoraproject.org.pp
index 5981bf8..80bf50e 100644
--- a/manifests/services/fedoraproject.org.pp
+++ b/manifests/services/fedoraproject.org.pp
@@ -1,14 +1,5 @@
 # Config files for http://fedoraproject.org/
 
-class fedoraproject-moin-slave {
-        symlink { '/srv/web/wiki/':
-                ensure => "/fedora/wiki/"
-        }
-    package { 'PyXML':
-        ensure => present,
-    }
-}
-
 class fedoraproject-moin inherits httpd {
     include mod_wsgi-package
 
@@ -28,6 +19,20 @@ class fedoraproject-moin inherits httpd {
     package { 'PyXML':
         ensure => present,
     }
+
+    folder { '/srv/web/wiki/':
+        source => 'blank/',
+        require => Folder['/srv/web/'],
+    }
+
+    mount { "/srv/web/wiki":
+        device  =>
"ntap-fedora1.fedora.phx.redhat.com:/vol/fedora/app/wiki",
+        fstype  => "nfs",
+        ensure  => "mounted",
+        options => "defaults",
+        atboot  => true
+    }
+
 }
 
 class fedoraproject-proxy inherits httpd {
-- 
1.5.5.1

[Toshio Kuratomi]

Ricky Zhou wrote:
>  Hi, Rahul reported that /wikiold/ is currently broken, so it looks
> like
>  we missed some stuff during the rebuild.  I wasn't sure if this is
>  considered under the change freeze, so here's the puppet patch I'd like
>  to apply (also, can somebody confirm that the mount for /srv/web/wiki is correct?):
>  
>  Thanks,
>  Ricky
>   
+1

I think wikiold falls under Support (which we'd freeze for a final
release but not now) or Value Added (it's not something anyone should
need but is something they could need.)

-Toshio

>  
>  From 7a4f9b64fe100dd4eb7de9ad57c98338bf0dd7f7 Mon Sep 17 00:00:00 2001
>  From: Ricky Zhou <ricky(a)fedoraproject.org&gt;
>  Date: Tue, 16 Sep 2008 03:56:43 +0000
>  Subject: [PATCH] Fix up old moin setup.
>  
>  ---
>   configs/web/applications/moin.wsgi      |   11 +++++++++--
>   manifests/services/fedoraproject.org.pp |   23 ++++++++++++++---------
>   2 files changed, 23 insertions(+), 11 deletions(-)
>  
>  diff --git a/configs/web/applications/moin.wsgi b/configs/web/applications/moin.wsgi
>  index 5bd3772..bfd0d86 100644
>  --- a/configs/web/applications/moin.wsgi
>  +++ b/configs/web/applications/moin.wsgi
>  @@ -1,7 +1,14 @@
>  -#!/usr/bin/python
>   import sys
>   sys.path.insert(0, '/srv/web/wiki')
>   
>  -from MoinMoin.server.wsgi import moinmoinApp
>  +import logging
>  +
>  +from MoinMoin.server.server_wsgi import WsgiConfig, moinmoinApp
>  +
>  +class Config(WsgiConfig):
>  +    logPath = 'moin.log'
>  +
>  +config = Config()
>   
>   application = moinmoinApp
>  +
>  diff --git a/manifests/services/fedoraproject.org.pp
> b/manifests/services/fedoraproject.org.pp
>  index 5981bf8..80bf50e 100644
>  --- a/manifests/services/fedoraproject.org.pp
>  +++ b/manifests/services/fedoraproject.org.pp
>  @@ -1,14 +1,5 @@
>   # Config files for http://fedoraproject.org/
>   
>  -class fedoraproject-moin-slave {
>  -        symlink { '/srv/web/wiki/':
>  -                ensure => "/fedora/wiki/"
>  -        }
>  -    package { 'PyXML':
>  -        ensure => present,
>  -    }
>  -}
>  -
>   class fedoraproject-moin inherits httpd {
>       include mod_wsgi-package
>   
>  @@ -28,6 +19,20 @@ class fedoraproject-moin inherits httpd {
>       package { 'PyXML':
>           ensure => present,
>       }
>  +
>  +    folder { '/srv/web/wiki/':
>  +        source => 'blank/',
>  +        require => Folder['/srv/web/'],
>  +    }
>  +
>  +    mount { "/srv/web/wiki":
>  +        device  =>
> "ntap-fedora1.fedora.phx.redhat.com:/vol/fedora/app/wiki",
>  +        fstype  => "nfs",
>  +        ensure  => "mounted",
>  +        options => "defaults",
>  +        atboot  => true
>  +    }
>  +
>   }
>   
>   class fedoraproject-proxy inherits httpd {
>

[Mike McGrath]

On Mon, 15 Sep 2008, Toshio Kuratomi wrote:

>  Ricky Zhou wrote:
>  > Hi, Rahul reported that /wikiold/ is currently broken, so it looks like
>  > we missed some stuff during the rebuild.  I wasn't sure if this is
>  > considered under the change freeze, so here's the puppet patch I'd like
>  > to apply (also, can somebody confirm that the mount for /srv/web/wiki is correct?):
>  >
>  > Thanks,
>  > Ricky
>  >
>  +1
>
>  I think wikiold falls under Support (which we'd freeze for a final
>  release but not now) or Value Added (it's not something anyone should
>  need but is something they could need.)
>  

+1 from me as well, low risk, and it is just a pre-release freeze.

	-Mike