Merge remote-tracking branch 'greg-puppet/master' into greg-puppet

Conflicts: templates/puppet.conf.erb
aleksey-novikov · Apr 11, 2012 · 6f00714 · 6f00714
2 parents 7948ec3 + 2a851d8
commit 6f00714
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -20,6 +20,14 @@
       owner  => $puppet::params::user,
     }
 
+    # need to chown the $vardir before puppet does it, or else
+    # we can't write puppet.git/ on the first run
+
+    file { '/var/lib/puppet':
+      ensure => directory,
+      owner  => $puppet::params::user,
+    }
+
     include git
 
     git::repo { 'puppet_repo':

diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
@@ -26,3 +26,4 @@
     report      = true
     pluginsync  = true
     environment = <%= environment %>
+    server      = <%= puppetmaster rescue fqdn %>