Changed package fetching Makefiles for abusehelper, vsroom and wiki
No longer uses symlinks to manage package versions. Ppackage versions are now recorded in /srv/puppet/files/common/packages/manifests/*.pp instead, which must be included in the site or node manifest.
This commit is contained in:
parent
32956c0d26
commit
29bc90e6f6
6 changed files with 70 additions and 52 deletions
|
@ -7,7 +7,7 @@ class wiki::moin {
|
|||
mode => 0644,
|
||||
owner => root,
|
||||
group => root,
|
||||
source => "puppet:///files/packages/moin.tar.gz",
|
||||
source => "puppet:///files/packages/${moin_package}",
|
||||
links => follow,
|
||||
}
|
||||
file { "/usr/local/src/moin.patch":
|
||||
|
@ -15,7 +15,7 @@ class wiki::moin {
|
|||
mode => 0644,
|
||||
owner => root,
|
||||
group => root,
|
||||
source => "puppet:///files/packages/moin.patch",
|
||||
source => "puppet:///files/packages/${moin_patch}",
|
||||
links => follow,
|
||||
}
|
||||
util::extract::tar { "/usr/local/src/moin":
|
||||
|
@ -43,7 +43,7 @@ class wiki::graphingwiki::common {
|
|||
mode => 0644,
|
||||
owner => root,
|
||||
group => root,
|
||||
source => "puppet:///files/packages/graphingwiki.tar.gz",
|
||||
source => "puppet:///files/packages/${graphingwiki_package}",
|
||||
links => follow,
|
||||
}
|
||||
util::extract::tar { "/usr/local/src/graphingwiki":
|
||||
|
@ -284,10 +284,8 @@ class wiki::collab::base {
|
|||
}
|
||||
}
|
||||
|
||||
if !$collab_webhosts {
|
||||
$collab_webhosts = [ "${homename}" ]
|
||||
if $collab_webhosts {
|
||||
configwebhost { $collab_webhosts: }
|
||||
}
|
||||
|
||||
configwebhost { $collab_webhosts: }
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue