tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added variable $wiki::moin::shared pointing to moin's static files

Browse source
This commit is contained in:
Ossi Salmi 2012-01-30 17:09:39 +02:00
parent 6816871c1c
commit e1ba92e9ef
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wiki/manifests/init.pp
View file

@ -42,12 +42,12 @@ class wiki::moin {
require => Util::Patch["/usr/local/src/moin"], require => Util::Patch["/usr/local/src/moin"],
} }
$htdocs = $operatingsystem ? { $shared = $operatingsystem ? {
"ubuntu" => "/usr/local/share/moin/htdocs", "ubuntu" => "/usr/local/share/moin",
default => "/usr/share/moin/htdocs", default => "/usr/share/moin",
} }
file { "${htdocs}/.htaccess": file { "${shared}/htdocs/.htaccess":
ensure => present, ensure => present,
mode => 0644, mode => 0644,
owner => "root", owner => "root",
@ -214,11 +214,8 @@ class wiki::collab::base {
user => collab, user => collab,
group => collab, group => collab,
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => $operatingsystem ? { cwd => "${wiki::moin::shared}/underlay",
ubuntu => "/usr/local/share/moin/underlay", command => "cp -R pages /srv/wikis/collab/underlay && chmod -R g=u,o-rwx /srv/wikis/collab/underlay",
default => "/usr/share/moin/underlay",
},
command => "cp -R * /srv/wikis/collab/underlay && chmod -R g=u,o-rwx /srv/wikis/collab/underlay/*",
creates => "/srv/wikis/collab/underlay/pages", creates => "/srv/wikis/collab/underlay/pages",
require => File["/srv/wikis/collab/underlay"], require => File["/srv/wikis/collab/underlay"],
} }
@ -313,10 +310,7 @@ class wiki::collab::base {
file { "/srv/www/https/${name}/moin_static": file { "/srv/www/https/${name}/moin_static":
ensure => link, ensure => link,
target => $operatingsystem ? { target => "${wiki::moin::shared}/htdocs",
ubuntu => "/usr/local/share/moin/htdocs",
default => "/usr/share/moin/htdocs",
},
require => File["/srv/www/https/${name}"], require => File["/srv/www/https/${name}"],
} }
} }