diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp index 6a8279b..4a17e62 100644 --- a/abusesa/manifests/init.pp +++ b/abusesa/manifests/init.pp @@ -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 => '', + } + } + +} diff --git a/abusesa/manifests/live.pp b/abusesa/manifests/live.pp index a37ea93..3db9b05 100644 --- a/abusesa/manifests/live.pp +++ b/abusesa/manifests/live.pp @@ -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, diff --git a/abusesa/manifests/search.pp b/abusesa/manifests/search.pp index c2da79f..159023a 100644 --- a/abusesa/manifests/search.pp +++ b/abusesa/manifests/search.pp @@ -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,