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

Replaced fqdn variables with homename

Browse source
This commit is contained in:
Ossi Salmi 2010-11-08 14:16:04 +02:00 • committed by Timo Mkinen
parent c871e91a13
commit 45b597c29c
12 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apache/manifests/debian.pp
View file

@ -8,9 +8,9 @@ class apache::debian::common {
}
file { [ "/srv/www/http",
"/srv/www/http/${fqdn}",
"/srv/www/http/${homename}",
"/srv/www/log/http",
"/srv/www/log/http/${fqdn}",
"/srv/www/log/http/${homename}",
"/etc/apache2/conf.d",
"/etc/apache2/sites-enabled", ]:
ensure => directory,
@ -91,7 +91,7 @@ class apache::debian::server inherits apache::debian::common {
define apache::debian::site($aliases, $root, $redirect) {
if $name == "default" {
$site_fqdn = $fqdn
$site_fqdn = $homename
$site_conf = "/etc/apache2/sites-enabled/00-${site_fqdn}.conf"
$site_confdir = "/etc/apache2/sites-enabled/00-${site_fqdn}.d"
} else {
@ -164,9 +164,9 @@ define apache::debian::site($aliases, $root, $redirect) {
class apache::debian::sslserver inherits apache::debian::common {
file { [ "/srv/www/https",
"/srv/www/https/${fqdn}",
"/srv/www/https/${homename}",
"/srv/www/log/https",
"/srv/www/log/https/${fqdn}", ]:
"/srv/www/log/https/${homename}", ]:
ensure => directory,
mode => 0644,
owner => root,
@ -183,7 +183,7 @@ class apache::debian::sslserver inherits apache::debian::common {
define apache::debian::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
if $name == "default" {
$site_fqdn = $fqdn
$site_fqdn = $homename
} else {
$site_fqdn = $name
@ -215,7 +215,7 @@ define apache::debian::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
if $ssl_cert {
$real_ssl_cert = $ssl_cert
} else {
$real_ssl_cert = "${puppet_ssldir}/certs/${fqdn}.pem"
$real_ssl_cert = "${puppet_ssldir}/certs/${homename}.pem"
}
file { "/etc/ssl/certs/${site_fqdn}.crt":
@ -230,7 +230,7 @@ define apache::debian::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
if $ssl_key {
$real_ssl_key = $ssl_key
} else {
$real_ssl_key = "${puppet_ssldir}/private_keys/${fqdn}.pem"
$real_ssl_key = "${puppet_ssldir}/private_keys/${homename}.pem"
}
file { "/etc/ssl/private/${site_fqdn}.key":

4
apache/manifests/init.pp
View file

@ -140,7 +140,7 @@ define apache::site($aliases="", $root="", $redirect="") {
if !$redirect {
$site_fqdn = $name ? {
"default" => "${fqdn}",
"default" => "${homename}",
default => "${name}",
}
apache::webalizer::site { "http/${site_fqdn}":
@ -228,7 +228,7 @@ define apache::sslsite($root="", $ssl_cert="", $ssl_key="", $ssl_chain="") {
}
$site_fqdn = $name ? {
"default" => "${fqdn}",
"default" => "${homename}",
default => "${name}",
}
apache::webalizer::site { "https/${site_fqdn}":

16
apache/manifests/redhat.pp
View file

@ -10,9 +10,9 @@ class apache::redhat::server {
file { [ "/etc/httpd/conf.http.d",
"/etc/httpd/site.http.d",
"/srv/www/http",
"/srv/www/http/${fqdn}",
"/srv/www/http/${homename}",
"/srv/www/log/http",
"/srv/www/log/http/${fqdn}", ]:
"/srv/www/log/http/${homename}", ]:
ensure => directory,
mode => 0644,
owner => root,
@ -51,7 +51,7 @@ class apache::redhat::server {
define apache::redhat::site($aliases, $root, $redirect) {
if $name == "default" {
$site_fqdn = $fqdn
$site_fqdn = $homename
$site_conf = "/etc/httpd/site.http.d/00-${site_fqdn}.conf"
$site_confdir = "/etc/httpd/site.http.d/00-${site_fqdn}.d"
} else {
@ -136,9 +136,9 @@ class apache::redhat::sslserver {
file { [ "/etc/httpd/conf.https.d",
"/etc/httpd/site.https.d",
"/srv/www/https",
"/srv/www/https/${fqdn}",
"/srv/www/https/${homename}",
"/srv/www/log/https",
"/srv/www/log/https/${fqdn}", ]:
"/srv/www/log/https/${homename}", ]:
ensure => directory,
mode => 0644,
owner => root,
@ -198,7 +198,7 @@ class apache::redhat::sslserver {
define apache::redhat::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
if $name == "default" {
$site_fqdn = $fqdn
$site_fqdn = $homename
} else {
$site_fqdn = $name
@ -230,7 +230,7 @@ define apache::redhat::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
if $ssl_cert {
$real_ssl_cert = $ssl_cert
} else {
$real_ssl_cert = "${puppet_ssldir}/certs/${fqdn}.pem"
$real_ssl_cert = "${puppet_ssldir}/certs/${homename}.pem"
}
file { "/etc/pki/tls/certs/${site_fqdn}.crt":
@ -245,7 +245,7 @@ define apache::redhat::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
if $ssl_key {
$real_ssl_key = $ssl_key
} else {
$real_ssl_key = "${puppet_ssldir}/private_keys/${fqdn}.pem"
$real_ssl_key = "${puppet_ssldir}/private_keys/${homename}.pem"
}
file { "/etc/pki/tls/private/${site_fqdn}.key":