abusesa: Clean up common code in webhost handling
This commit is contained in:
parent
63bc23b210
commit
a9b7e9a72e
3 changed files with 25 additions and 30 deletions
|
@ -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 => '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -85,21 +85,7 @@ class abusesa::live(
|
||||||
#
|
#
|
||||||
define abusesa::live::configwebhost($htdocs) {
|
define abusesa::live::configwebhost($htdocs) {
|
||||||
|
|
||||||
if ! defined(File["/srv/www/https/${name}/abusesa"]) {
|
abusesa::configwebhost { $name: }
|
||||||
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 => '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
file { "/srv/www/https/${name}/abusesa/live":
|
file { "/srv/www/https/${name}/abusesa/live":
|
||||||
ensure => link,
|
ensure => link,
|
||||||
|
|
|
@ -136,21 +136,7 @@ class abusesa::search(
|
||||||
#
|
#
|
||||||
define abusesa::search::configwebhost($htdocs) {
|
define abusesa::search::configwebhost($htdocs) {
|
||||||
|
|
||||||
if ! defined(File["/srv/www/https/${name}/abusesa"]) {
|
abusesa::configwebhost { $name: }
|
||||||
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 => '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
file { "/srv/www/https/${name}/abusesa/search":
|
file { "/srv/www/https/${name}/abusesa/search":
|
||||||
ensure => link,
|
ensure => link,
|
||||||
|
|
Loading…
Add table
Reference in a new issue