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

abusesa: Clean up common code in webhost handling

Browse source
This commit is contained in:
Ossi Salmi 2015-06-15 16:01:03 +03:00
parent 63bc23b210
commit a9b7e9a72e
3 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
abusesa/manifests/init.pp
View file

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

16
abusesa/manifests/live.pp
View file

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

16
abusesa/manifests/search.pp
View file

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