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

Changed remaining fqdn references to homename

Browse source
This commit is contained in:
Ossi Salmi 2013-08-03 00:06:03 +03:00
parent 74d93dae34
commit ebde843cc6
17 changed files with 48 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apache/manifests/init.pp
View file

@ -148,7 +148,7 @@ class apache::server inherits apache::common {
# $aliases:
# Optional ServerAlias for this virtual host.
# $root:
# Path to document root. Defaults to /srv/www/http/$fqdn
# Path to document root. Defaults to /srv/www/http/$homename
# $redirect:
# Add redirect to given URL.
# $proxy:
@ -196,7 +196,7 @@ define apache::site($aliases="", $root="", $redirect="", $proxy="") {
if !$redirect {
$site_fqdn = $name ? {
"default" => $homename,
"default" => $::homename,
default => $name,
}
apache::webalizer::site { "http/${site_fqdn}":
@ -269,7 +269,7 @@ class apache::sslserver::listen {
# $ipaddr:
# IP address of virtual host. Defaults to _default_.
# $root:
# Path to document root. Defaults to /srv/www/https/$fqdn
# Path to document root. Defaults to /srv/www/https/$homename
# $ssl_cert:
# Path to SSL certificate. Defaults to puppet client certificate.
# $ssl_key:
@ -320,7 +320,7 @@ define apache::sslsite($first=false, $ipaddr="_default_", $root="", $ssl_cert=""
}
$site_fqdn = $name ? {
"default" => $homename,
"default" => $::homename,
default => $name,
}
apache::webalizer::site { "https/${site_fqdn}":