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
Show stats 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}":

2
cups/manifests/init.pp
View file

@ -63,7 +63,7 @@ class cups::server inherits cups::client {
file { "/etc/cups/cupsd.conf":
ensure => present,
source => [ "puppet:///files/cups/cupsd.conf.${fqdn}",
source => [ "puppet:///files/cups/cupsd.conf.${::homename}",
"puppet:///files/cups/cupsd.conf",
"puppet:///modules/cups/cupsd.conf", ],
mode => "0640",

2
dhcp/manifests/init.pp
View file

@ -103,7 +103,7 @@ class dhcp::server inherits dhcp::server::common {
file { "dhcpd.conf":
name => "${confdir}/dhcpd.conf",
ensure => present,
source => [ "puppet:///files/dhcp/dhcpd.conf.${fqdn}",
source => [ "puppet:///files/dhcp/dhcpd.conf.${::homename}",
"puppet:///files/dhcp/dhcpd.conf", ],
mode => "0644",
owner => "root",

4
dns/manifests/init.pp
View file

@ -203,7 +203,7 @@ class dns::server {
file { "${chroot}${confdir}/named.conf.options":
ensure => present,
source => [ "puppet:///files/dns/named.conf.options.${fqdn}",
source => [ "puppet:///files/dns/named.conf.options.${::homename}",
"puppet:///files/dns/named.conf.options",
"puppet:///modules/dns/named.conf.options", ],
mode => "0640",
@ -218,7 +218,7 @@ class dns::server {
file { "${chroot}${confdir}/named.conf.local":
ensure => present,
source => [ "puppet:///files/dns/named.conf.local.${fqdn}",
source => [ "puppet:///files/dns/named.conf.local.${::homename}",
"puppet:///files/dns/named.conf.local",
"puppet:///modules/dns/named.conf.local", ],
mode => "0640",

2
firewall/manifests/init.pp
View file

@ -50,7 +50,7 @@ class firewall {
#
# Config file is searched in following order:
#
# puppet:///files/firewall/${config}.${fqdn}
# puppet:///files/firewall/${config}.${homename}
# puppet:///files/firewall/${config}
#
# where config is firewall configuration file name

4
func/manifests/init.pp
View file

@ -18,7 +18,7 @@ class func::minion {
file { "/etc/pki/certmaster/${hostname}.pem":
ensure => present,
source => "${puppet_ssldir}/private_keys/${fqdn}.pem",
source => "${puppet_ssldir}/private_keys/${::homename}.pem",
mode => "0600",
owner => "root",
group => "root",
@ -27,7 +27,7 @@ class func::minion {
}
file { "/etc/pki/certmaster/${hostname}.cert":
ensure => present,
source => "${puppet_ssldir}/certs/${fqdn}.pem",
source => "${puppet_ssldir}/certs/${::homename}.pem",
mode => "0644",
owner => "root",
group => "root",

2
git/manifests/init.pp
View file

@ -108,7 +108,7 @@ class git::gitweb inherits git::server {
file { "/var/www/git/gitweb_config.perl":
ensure => present,
source => [ "puppet:///files/git/gitweb_config.perl.${fqdn}",
source => [ "puppet:///files/git/gitweb_config.perl.${::homename}",
"puppet:///files/git/gitweb_config.perl",
"puppet:///modules/git/gitweb_config.perl", ],
mode => "0644",

2
ifstated/manifests/init.pp
View file

@ -6,7 +6,7 @@ class ifstated {
file { "/etc/ifstated.conf":
ensure => present,
source => [ "puppet:///private/ifstated.conf",
"puppet:///files/firewall/ifstated.conf.${fqdn}",
"puppet:///files/firewall/ifstated.conf.${::homename}",
"puppet:///files/firewall/ifstated.conf", ],
mode => "0644",
owner => "root",

2
iscsi/manifests/init.pp
View file

@ -15,7 +15,7 @@ class iscsi::server {
file { "/etc/tgt/targets.conf":
ensure => present,
source => [ "puppet:///files/iscsi/targets.conf.${fqdn}",
source => [ "puppet:///files/iscsi/targets.conf.${::homename}",
"puppet:///files/iscsi/targets.conf",
"puppet:///modules/iscsi/targets.conf", ],
mode => "0600",

2
nfs/manifests/init.pp
View file

@ -48,7 +48,7 @@ class nfs::server {
file { "/etc/exports":
ensure => present,
source => [
"puppet:///files/nfs/exports.${::fqdn}",
"puppet:///files/nfs/exports.${::homename}",
"puppet:///modules/nfs/exports",
],
mode => "0644",

12
postfix/manifests/init.pp
View file

@ -12,7 +12,7 @@
# Optional smarthost used for sending mail.
#
# $postfix_hostname:
# Hostname of postfix server. Defaults to $fqdn.
# Hostname of postfix server. Defaults to $homename.
#
# $postfix_interfaces:
# Interfaces to listen. Defaults to 'localhost'.
@ -55,19 +55,15 @@ class postfix {
}
if !$mail_domain {
if $domain {
$mail_domain = $domain
if $::domain {
$mail_domain = $::domain
} else {
fail("Failed to set \$mail_domain, missing \$domain")
}
}
if !$postfix_hostname {
if $fqdn {
$postfix_hostname = $fqdn
} else {
fail("Failed to set \$postfix_hostname, missing \$fqdn")
}
$postfix_hostname = $::homename
}
if !$postfix_interfaces {

2
pulseaudio/manifests/init.pp
View file

@ -37,7 +37,7 @@ class pulseaudio::server inherits pulseaudio::common {
file { "/etc/pulse/system.pa":
ensure => present,
source => [ "puppet:///files/pulseaudio/system.pa.${fqdn}",
source => [ "puppet:///files/pulseaudio/system.pa.${::homename}",
"puppet:///files/pulseaudio/system.pa", ],
mode => "0644",
owner => root,

4
puppet/manifests/init.pp
View file

@ -402,7 +402,7 @@ class puppet::server::common inherits puppet::client {
file { "/etc/puppet/tagmail.conf":
ensure => present,
source => [ "puppet:///files/puppet/tagmail.conf.${fqdn}",
source => [ "puppet:///files/puppet/tagmail.conf.${::homename}",
"puppet:///files/puppet/tagmail.conf",
"puppet:///modules/puppet/tagmail.conf", ],
mode => "0644",
@ -416,7 +416,7 @@ class puppet::server::common inherits puppet::client {
file { "/etc/puppet/fileserver.conf":
ensure => present,
source => [ "puppet:///files/puppet/fileserver.conf.${fqdn}",
source => [ "puppet:///files/puppet/fileserver.conf.${::homename}",
"puppet:///files/puppet/fileserver.conf",
"puppet:///modules/puppet/fileserver.conf", ],
mode => "0644",

2
samba/manifests/init.pp
View file

@ -151,7 +151,7 @@ class samba::server($names=[$::hostname], $auth="tdbsam",
file { "/etc/samba/lmhosts":
ensure => present,
source => [ "puppet:///files/samba/lmhosts.${fqdn}",
source => [ "puppet:///files/samba/lmhosts.${::homename}",
"puppet:///files/samba/lmhosts",
"puppet:///modules/samba/lmhosts", ],
mode => "0644",

2
sasl/manifests/init.pp
View file

@ -183,7 +183,7 @@ define sasl::saslauthd::service($content=undef) {
ensure => present,
content => $content,
source => $content ? {
undef => [ "puppet:///files/sasl/${name}.${fqdn}.conf",
undef => [ "puppet:///files/sasl/${name}.${::homename}.conf",
"puppet:///files/sasl/${name}.conf",
"puppet:///files/sasl/service.conf",
"puppet:///modules/sasl/service.conf", ],

20
sendmail/manifests/init.pp
View file

@ -302,14 +302,14 @@ class sendmail::server inherits sendmail::common {
file { "/etc/aliases":
ensure => present,
source => [
"puppet:///files/mail/aliases.${fqdn}",
"puppet:///files/mail/aliases",
"puppet:///modules/sendmail/aliases",
],
mode => "0644",
owner => "root",
group => "root",
source => [
"puppet:///files/mail/aliases.${::homename}",
"puppet:///files/mail/aliases",
"puppet:///modules/sendmail/aliases",
],
notify => Exec["newaliases"],
require => Package["sendmail"],
}
@ -324,7 +324,7 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/access.${fqdn}",
"puppet:///files/mail/access.${::homename}",
"puppet:///files/mail/access",
"puppet:///modules/sendmail/empty",
],
@ -344,7 +344,7 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/genericstable.${fqdn}",
"puppet:///files/mail/genericstable.${::homename}",
"puppet:///files/mail/genericstable",
"puppet:///modules/sendmail/empty",
],
@ -364,7 +364,7 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/mailertable.${fqdn}",
"puppet:///files/mail/mailertable.${::homename}",
"puppet:///files/mail/mailertable",
"puppet:///modules/sendmail/empty",
],
@ -384,7 +384,7 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/virtusertable.${fqdn}",
"puppet:///files/mail/virtusertable.${::homename}",
"puppet:///files/mail/virtusertable",
"puppet:///modules/sendmail/empty",
],
@ -404,7 +404,7 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/local-host-names.${fqdn}",
"puppet:///files/mail/local-host-names.${::homename}",
"puppet:///files/mail/local-host-names",
"puppet:///modules/sendmail/empty",
],

2
yum/manifests/init.pp
View file

@ -9,7 +9,7 @@ class yum::updatesd {
file { "/etc/yum/yum-updatesd.conf":
ensure => present,
source => [ "puppet:///files/yum/yum-updatesd.conf.${fqdn}",
source => [ "puppet:///files/yum/yum-updatesd.conf.${::homename}",
"puppet:///files/yum/yum-updatesd.conf",
"puppet:///modules/yum/yum-updatesd.conf", ],
mode => "0644",