summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/puppetmasterd.pp2
-rw-r--r--templates/puppetmaster.erb1
2 files changed, 1 insertions, 2 deletions
diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp
index 671d787..ce5195e 100644
--- a/manifests/puppetmasterd.pp
+++ b/manifests/puppetmasterd.pp
@@ -4,7 +4,7 @@ class puppetmasterd {
# Configuration
case $puppetmaster_servertype {
'': {
- $puppetmaster_servertype = 'mongrel'
+ $puppetmaster_servertype = 'mongrel'
$puppetmaster_daemon_opts = '--ssl_client_header=HTTP_X_SSL_SUBJECT'
}
}
diff --git a/templates/puppetmaster.erb b/templates/puppetmaster.erb
index 0aa5f3b..2ae5f11 100644
--- a/templates/puppetmaster.erb
+++ b/templates/puppetmaster.erb
@@ -4,7 +4,6 @@
START=yes
# Startup options
-#DAEMON_OPTS=""
DAEMON_OPTS="<%= puppetmaster_daemon_opts %>"
# What server type to run