From 90806867a15b8f97f3d289617b13a6fc2facbca8 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Wed, 28 Feb 2007 17:03:21 +0000
Subject: 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
---
 lib/puppet/sslcertificates.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/puppet/sslcertificates.rb')

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."],
-- 
cgit