diff options
| -rw-r--r-- | modules/puppet/manifests/master.pp | 4 | ||||
| -rw-r--r-- | modules/puppet/templates/apache_proxy_vhost.conf | 1 | ||||
| -rw-r--r-- | modules/puppet/templates/hiera.yaml | 1 | ||||
| -rw-r--r-- | modules/puppet/templates/puppet.conf | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/modules/puppet/manifests/master.pp b/modules/puppet/manifests/master.pp index 1d2420a5..b8c671fb 100644 --- a/modules/puppet/manifests/master.pp +++ b/modules/puppet/manifests/master.pp @@ -20,8 +20,8 @@ class puppet::master inherits puppet { service { 'puppetmaster': # uncomment once thin is enabled -# ensure => stopped, - subscribe => [Package['puppet-server'], +# ensure => stopped, + subscribe => [Package['puppet-server'], File['/etc/puppet/puppet.conf']], } diff --git a/modules/puppet/templates/apache_proxy_vhost.conf b/modules/puppet/templates/apache_proxy_vhost.conf index d1e797e2..607998c4 100644 --- a/modules/puppet/templates/apache_proxy_vhost.conf +++ b/modules/puppet/templates/apache_proxy_vhost.conf @@ -40,4 +40,3 @@ ProxyRequests Off ProxyPreserveHost on </VirtualHost> - diff --git a/modules/puppet/templates/hiera.yaml b/modules/puppet/templates/hiera.yaml index 84e75607..8b5fcf73 100644 --- a/modules/puppet/templates/hiera.yaml +++ b/modules/puppet/templates/hiera.yaml @@ -7,4 +7,3 @@ - common :yaml: :datadir: /etc/puppet/hieradata - diff --git a/modules/puppet/templates/puppet.conf b/modules/puppet/templates/puppet.conf index fdda64ab..2411acd9 100644 --- a/modules/puppet/templates/puppet.conf +++ b/modules/puppet/templates/puppet.conf @@ -11,10 +11,8 @@ # Where SSL certificates are kept. # The default value is '$confdir/ssl'. ssldir = $vardir/ssl - + modulepath = $confdir/modules:$confdir/deployment:$confdir/external:/usr/share/puppet/modules queue_type = stomp queue_source = stomp://localhost:61613 <%= db_config %> - - |