Commit 6156f9da authored by Darren Patterson's avatar Darren Patterson
Browse files

fix for fqdn_lc across module

parent 1defb4d6
release/004.009 (2014-12-17)
Fix for $::fqdn_lc across module. (darrenp1)
release/004.008 (2014-12-11)
[os] Fix for RHEL lsb package names for different releases. (darrenp1)
......
# Defines the DNS configuration of a system.
class base::dns {
base::dns::resolv_conf { $::fqdn: ensure => present }
base::dns::resolv_conf { $::fqdn_lc: ensure => present }
}
# This class adds a reference to a local DNS caching server.
......@@ -9,7 +9,7 @@ class base::dns::cache inherits base::dns {
include base::daemontools,
base::dns::cache_packages
Base::Dns::Resolv_conf[$::fqdn] { dns_cache => true }
Base::Dns::Resolv_conf[$::fqdn_lc] { dns_cache => true }
}
class base::dns::cache_packages {
......@@ -30,15 +30,15 @@ class base::dns::cache_packages {
# These classes are for servers at Livermore. The resolv.conf puts
# the Livermore dns server first in the search list.
class base::dns::dr inherits base::dns {
Base::Dns::Resolv_conf[$::fqdn] { first_dns_server => '204.63.227.68' }
Base::Dns::Resolv_conf[$::fqdn_lc] { first_dns_server => '204.63.227.68' }
}
class base::dns::dr-cache inherits base::dns::cache {
Base::Dns::Resolv_conf[$::fqdn] { first_dns_server => '204.63.227.68' }
Base::Dns::Resolv_conf[$::fqdn_lc] { first_dns_server => '204.63.227.68' }
}
# This class is for domain name servers.
class base::dns::dns-server inherits base::dns {
Base::Dns::Resolv_conf[$::fqdn] { is_dns_server => ture }
Base::Dns::Resolv_conf[$::fqdn_lc] { is_dns_server => ture }
}
......
......@@ -3,7 +3,7 @@
class base::postfix::off_campus inherits base::postfix {
Base::Postfix::Map['/etc/postfix/senders'] {
content => "root@stanford.edu root@${::fqdn}\n",
content => "root@stanford.edu root@${::fqdn_lc}\n",
}
File['/etc/postfix/main.cf'] {
source => 'puppet:///modules/base/postfix/etc/postfix/main.cf.off-campus',
......
......@@ -31,7 +31,7 @@
# Simple Exmaple
# --------------
#
# base::syslog::tls_ca_cert: { $::fqdn: ensure => present }
# base::syslog::tls_ca_cert: { $::fqdn_lc: ensure => present }
# base::syslog::tls { '50-ldap-remote.conf':
# ensure => 'present',
# content => 's_idg_test/etc/rsyslog.d/50-ldap-tls.conf.erb'),
......@@ -49,7 +49,7 @@
# use_default => false,
# }
#
# base::syslog::tls_ca_cert: { $::fqdn:
# base::syslog::tls_ca_cert: { $::fqdn_lc:
# syslog_server => 'logsink-dev.stanford.edu',
# ensure => present
# }
......@@ -89,7 +89,7 @@ define base::syslog::tls(
# Install the certificate for the service
if $service_name == undef {
$cert_subject = "syslog.${::fqdn}"
$cert_subject = "syslog.${::fqdn_lc}"
} else {
$cert_subject = "syslog.${service_name}"
}
......
......@@ -4,7 +4,7 @@
#
# Example:
#
# base::syslog::tls_ca_cert{ $::fqdn: ensure => present }
# base::syslog::tls_ca_cert{ $::fqdn_lc: ensure => present }
define base::syslog::tls_ca_cert(
$syslog_server = 'logsink.stanford.edu',
......
......@@ -28,7 +28,7 @@ class base::up2date {
source => 'puppet:///modules/base/up2date/etc/newsyslog.daily/up2date';
}
base::up2date::sources { $::fqdn: ensure => present }
base::up2date::sources { $::fqdn_lc: ensure => present }
service { 'rhnsd':
ensure => stopped,
......@@ -37,4 +37,4 @@ class base::up2date {
}
}
}
\ No newline at end of file
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment