summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2008-11-25 22:14:07 -0500
committerTodd Zullinger <tmz@pobox.com>2008-11-26 00:02:06 -0500
commit060d3b006ac63124cecf0695509dbedf09e88d0e (patch)
tree89a7db1cae0c7b0e047afc6e0d37f9cfe0b55766
parent08410a381980061e29b442edcf5a45356d3a4284 (diff)
downloadpuppet-host-package-060d3b006ac63124cecf0695509dbedf09e88d0e.zip
puppet-host-package-060d3b006ac63124cecf0695509dbedf09e88d0e.tar.gz
puppet-host-package-060d3b006ac63124cecf0695509dbedf09e88d0e.tar.xz
Simplify setting ssldir default
-rwxr-xr-xpuppethost.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppethost.py b/puppethost.py
index 15f0478..b980e6a 100755
--- a/puppethost.py
+++ b/puppethost.py
@@ -12,7 +12,6 @@ import commands
import optparse
import tempfile
-ssldir = '/etc/puppet/ssl'
defaults = {
'destssldir': '',
'domain': '',
@@ -22,11 +21,10 @@ defaults = {
'force_package': False,
'release': '1',
'rpmdir': os.path.abspath(os.curdir),
- 'ssldir': ssldir,
+ 'ssldir': '/etc/puppet/ssl',
'template': '%(ssldir)s/template.spec',
'verbose': 1,
}
-del ssldir
try:
defaults['domain'] = socket.getfqdn().split('.', 1)[1]