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

abusesa: Fix duplicate declaration

Browse source
This commit is contained in:
Ossi Salmi 2015-06-16 15:19:32 +03:00
parent b3f7b92e01
commit afce28f5cd
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
abusesa/manifests/init.pp
View file

@ -93,20 +93,18 @@ class abusesa(
# #
define abusesa::configwebhost() { define abusesa::configwebhost() {
if ! defined(File["/srv/www/https/${name}/abusesa"]) { file { "/srv/www/https/${name}/abusesa":
file { "/srv/www/https/${name}/abusesa": ensure => directory,
ensure => directory, mode => '0755',
mode => '0755', owner => 'root',
owner => 'root', group => 'root',
group => 'root', }
} file { "/srv/www/https/${name}/abusesa/index.html":
file { "/srv/www/https/${name}/abusesa/index.html": ensure => present,
ensure => present, mode => '0644',
mode => '0644', owner => 'root',
owner => 'root', group => 'root',
group => 'root', content => '',
content => '',
}
} }
} }

4
abusesa/manifests/live.pp
View file

@ -85,7 +85,9 @@ class abusesa::live(
# #
define abusesa::live::configwebhost($htdocs) { define abusesa::live::configwebhost($htdocs) {
abusesa::configwebhost { $name: } if ! defined(Abusesa::Configwebhost[$name]) {
abusesa::configwebhost { $name: }
}
file { "/srv/www/https/${name}/abusesa/live": file { "/srv/www/https/${name}/abusesa/live":
ensure => link, ensure => link,

4
abusesa/manifests/search.pp
View file

@ -136,7 +136,9 @@ class abusesa::search(
# #
define abusesa::search::configwebhost($htdocs) { define abusesa::search::configwebhost($htdocs) {
abusesa::configwebhost { $name: } if ! defined(Abusesa::Configwebhost[$name]) {
abusesa::configwebhost { $name: }
}
file { "/srv/www/https/${name}/abusesa/search": file { "/srv/www/https/${name}/abusesa/search":
ensure => link, ensure => link,