From 811b7c088411e6de72903909cc75397d5f36687c Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 1 Aug 2012 10:16:50 +0300 Subject: [PATCH] Install underlay package for moin 1.9 --- wiki/manifests/init.pp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp index 116d385..99d43a7 100644 --- a/wiki/manifests/init.pp +++ b/wiki/manifests/init.pp @@ -246,6 +246,18 @@ class wiki::collab::base { require => File["/srv/wikis/collab/underlay"], before => Exec["collab-create collab collab"], } + if $wiki::moin::moin_package =~ /^moin-1\.9/ { + $underlay_package = "/srv/wikis/collab/underlay/pages/LanguageSetup/attachments/English--all_pages.zip" + exec { "collab-install-underlay": + user => "collab", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + environment => "PYTHONPATH=/srv/wikis/collab/wikis/collab/config", + command => "/bin/sh -c 'umask 007; python ${::pythonsitedir}/MoinMoin/packages.py i ${underlay_package}'", + refreshonly => true, + subscribe => Exec["collab-copy-underlay"], + require => Exec["collab-account-create -f -r collab"] + } + } file { "/srv/wikis/collab/config/collabfarm.py": ensure => present,