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: # $aliases:
# Optional ServerAlias for this virtual host. # Optional ServerAlias for this virtual host.
# $root: # $root:
# Path to document root. Defaults to /srv/www/http/$fqdn # Path to document root. Defaults to /srv/www/http/$homename
# $redirect: # $redirect:
# Add redirect to given URL. # Add redirect to given URL.
# $proxy: # $proxy:
@ -196,7 +196,7 @@ define apache::site($aliases="", $root="", $redirect="", $proxy="") {
if !$redirect { if !$redirect {
$site_fqdn = $name ? { $site_fqdn = $name ? {
"default" => $homename, "default" => $::homename,
default => $name, default => $name,
} }
apache::webalizer::site { "http/${site_fqdn}": apache::webalizer::site { "http/${site_fqdn}":
@ -269,7 +269,7 @@ class apache::sslserver::listen {
# $ipaddr: # $ipaddr:
# IP address of virtual host. Defaults to _default_. # IP address of virtual host. Defaults to _default_.
# $root: # $root:
# Path to document root. Defaults to /srv/www/https/$fqdn # Path to document root. Defaults to /srv/www/https/$homename
# $ssl_cert: # $ssl_cert:
# Path to SSL certificate. Defaults to puppet client certificate. # Path to SSL certificate. Defaults to puppet client certificate.
# $ssl_key: # $ssl_key:
@ -320,7 +320,7 @@ define apache::sslsite($first=false, $ipaddr="_default_", $root="", $ssl_cert=""
} }
$site_fqdn = $name ? { $site_fqdn = $name ? {
"default" => $homename, "default" => $::homename,
default => $name, default => $name,
} }
apache::webalizer::site { "https/${site_fqdn}": 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": file { "/etc/cups/cupsd.conf":
ensure => present, ensure => present,
source => [ "puppet:///files/cups/cupsd.conf.${fqdn}", source => [ "puppet:///files/cups/cupsd.conf.${::homename}",
"puppet:///files/cups/cupsd.conf", "puppet:///files/cups/cupsd.conf",
"puppet:///modules/cups/cupsd.conf", ], "puppet:///modules/cups/cupsd.conf", ],
mode => "0640", mode => "0640",

2
dhcp/manifests/init.pp
View file

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

4
dns/manifests/init.pp
View file

@ -203,7 +203,7 @@ class dns::server {
file { "${chroot}${confdir}/named.conf.options": file { "${chroot}${confdir}/named.conf.options":
ensure => present, 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:///files/dns/named.conf.options",
"puppet:///modules/dns/named.conf.options", ], "puppet:///modules/dns/named.conf.options", ],
mode => "0640", mode => "0640",
@ -218,7 +218,7 @@ class dns::server {
file { "${chroot}${confdir}/named.conf.local": file { "${chroot}${confdir}/named.conf.local":
ensure => present, 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:///files/dns/named.conf.local",
"puppet:///modules/dns/named.conf.local", ], "puppet:///modules/dns/named.conf.local", ],
mode => "0640", mode => "0640",

2
firewall/manifests/init.pp
View file

@ -50,7 +50,7 @@ class firewall {
# #
# Config file is searched in following order: # Config file is searched in following order:
# #
# puppet:///files/firewall/${config}.${fqdn} # puppet:///files/firewall/${config}.${homename}
# puppet:///files/firewall/${config} # puppet:///files/firewall/${config}
# #
# where config is firewall configuration file name # 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": file { "/etc/pki/certmaster/${hostname}.pem":
ensure => present, ensure => present,
source => "${puppet_ssldir}/private_keys/${fqdn}.pem", source => "${puppet_ssldir}/private_keys/${::homename}.pem",
mode => "0600", mode => "0600",
owner => "root", owner => "root",
group => "root", group => "root",
@ -27,7 +27,7 @@ class func::minion {
} }
file { "/etc/pki/certmaster/${hostname}.cert": file { "/etc/pki/certmaster/${hostname}.cert":
ensure => present, ensure => present,
source => "${puppet_ssldir}/certs/${fqdn}.pem", source => "${puppet_ssldir}/certs/${::homename}.pem",
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "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": file { "/var/www/git/gitweb_config.perl":
ensure => present, 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:///files/git/gitweb_config.perl",
"puppet:///modules/git/gitweb_config.perl", ], "puppet:///modules/git/gitweb_config.perl", ],
mode => "0644", mode => "0644",

2
ifstated/manifests/init.pp
View file

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

2
iscsi/manifests/init.pp
View file

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

2
nfs/manifests/init.pp
View file

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

14
postfix/manifests/init.pp
View file

@ -12,7 +12,7 @@
# Optional smarthost used for sending mail. # Optional smarthost used for sending mail.
# #
# $postfix_hostname: # $postfix_hostname:
# Hostname of postfix server. Defaults to $fqdn. # Hostname of postfix server. Defaults to $homename.
# #
# $postfix_interfaces: # $postfix_interfaces:
# Interfaces to listen. Defaults to 'localhost'. # Interfaces to listen. Defaults to 'localhost'.
@ -55,19 +55,15 @@ class postfix {
} }
if !$mail_domain { if !$mail_domain {
if $domain { if $::domain {
$mail_domain = $domain $mail_domain = $::domain
} else { } else {
fail("Failed to set \$mail_domain, missing \$domain") fail("Failed to set \$mail_domain, missing \$domain")
} }
} }
if !$postfix_hostname { if !$postfix_hostname {
if $fqdn { $postfix_hostname = $::homename
$postfix_hostname = $fqdn
} else {
fail("Failed to set \$postfix_hostname, missing \$fqdn")
}
} }
if !$postfix_interfaces { if !$postfix_interfaces {
@ -105,7 +101,7 @@ class postfix {
require => Package["postfix"], require => Package["postfix"],
notify => Service["postfix"], notify => Service["postfix"],
} }
exec { "usermod-postfix-ssl-cert": exec { "usermod-postfix-ssl-cert":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "usermod -a -G ssl-cert postfix", command => "usermod -a -G ssl-cert postfix",

2
pulseaudio/manifests/init.pp
View file

@ -37,7 +37,7 @@ class pulseaudio::server inherits pulseaudio::common {
file { "/etc/pulse/system.pa": file { "/etc/pulse/system.pa":
ensure => present, ensure => present,
source => [ "puppet:///files/pulseaudio/system.pa.${fqdn}", source => [ "puppet:///files/pulseaudio/system.pa.${::homename}",
"puppet:///files/pulseaudio/system.pa", ], "puppet:///files/pulseaudio/system.pa", ],
mode => "0644", mode => "0644",
owner => root, 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": file { "/etc/puppet/tagmail.conf":
ensure => present, ensure => present,
source => [ "puppet:///files/puppet/tagmail.conf.${fqdn}", source => [ "puppet:///files/puppet/tagmail.conf.${::homename}",
"puppet:///files/puppet/tagmail.conf", "puppet:///files/puppet/tagmail.conf",
"puppet:///modules/puppet/tagmail.conf", ], "puppet:///modules/puppet/tagmail.conf", ],
mode => "0644", mode => "0644",
@ -416,7 +416,7 @@ class puppet::server::common inherits puppet::client {
file { "/etc/puppet/fileserver.conf": file { "/etc/puppet/fileserver.conf":
ensure => present, ensure => present,
source => [ "puppet:///files/puppet/fileserver.conf.${fqdn}", source => [ "puppet:///files/puppet/fileserver.conf.${::homename}",
"puppet:///files/puppet/fileserver.conf", "puppet:///files/puppet/fileserver.conf",
"puppet:///modules/puppet/fileserver.conf", ], "puppet:///modules/puppet/fileserver.conf", ],
mode => "0644", mode => "0644",

6
samba/manifests/init.pp
View file

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

2
sasl/manifests/init.pp
View file

@ -183,7 +183,7 @@ define sasl::saslauthd::service($content=undef) {
ensure => present, ensure => present,
content => $content, content => $content,
source => $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/${name}.conf",
"puppet:///files/sasl/service.conf", "puppet:///files/sasl/service.conf",
"puppet:///modules/sasl/service.conf", ], "puppet:///modules/sasl/service.conf", ],

40
sendmail/manifests/init.pp
View file

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

2
yum/manifests/init.pp
View file

@ -9,7 +9,7 @@ class yum::updatesd {
file { "/etc/yum/yum-updatesd.conf": file { "/etc/yum/yum-updatesd.conf":
ensure => present, 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:///files/yum/yum-updatesd.conf",
"puppet:///modules/yum/yum-updatesd.conf", ], "puppet:///modules/yum/yum-updatesd.conf", ],
mode => "0644", mode => "0644",