diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-28 17:03:21 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-28 17:03:21 +0000 |
| commit | 90806867a15b8f97f3d289617b13a6fc2facbca8 (patch) | |
| tree | 6959db716d0831e436aeb64ea07d6c93262351e3 /lib/puppet/sslcertificates.rb | |
| parent | 17c59f8d83145c728bca3636dfa7c42f66967169 (diff) | |
| download | puppet-90806867a15b8f97f3d289617b13a6fc2facbca8.tar.gz puppet-90806867a15b8f97f3d289617b13a6fc2facbca8.tar.xz puppet-90806867a15b8f97f3d289617b13a6fc2facbca8.zip | |
Committing patch by Dennis Jacobfeuerborn to only use the domain name if it is set.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2246 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/sslcertificates.rb')
| -rwxr-xr-x | lib/puppet/sslcertificates.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/sslcertificates.rb b/lib/puppet/sslcertificates.rb index 8c93139a9..eaee75d6c 100755 --- a/lib/puppet/sslcertificates.rb +++ b/lib/puppet/sslcertificates.rb @@ -11,7 +11,11 @@ end module Puppet::SSLCertificates hostname = Facter["hostname"].value domain = Facter["domain"].value - fqdn = [hostname, domain].join(".") + if !domain || domain.empty? then + fqdn = hostname + else + fqdn = [hostname, domain].join(".") + end Puppet.setdefaults("certificates", :certdir => ["$ssldir/certs", "The certificate directory."], |