.gitignore

@@ -3,3 +3,4 @@ pkg
 spec/fixtures/
 spec/fixtures/manifests/site.pp
 .DS_Store
+*.swp

manifests/config.pp

@@ -78,10 +78,12 @@
         'basedir' => $r10k_basedir,
       },
     }
+    $source_keys = keys($r10k_sources)
   } else {
     validate_hash($sources)
 
     $r10k_sources = $sources
+    $source_keys = keys($r10k_sources)
   }
 
   file { 'r10k.yaml':

templates/r10k.yaml.erb

@@ -1,8 +1,12 @@
 :cachedir: <%= @cachedir %>
 <% unless @r10k_sources.empty? -%>
 :sources:
-<%# The splitting/joining monkeybusiness trims the YAML document header: `---` -%>
-<%= @r10k_sources.to_yaml.split("\n")[1..-1].join("\n") %>
+<% @source_keys.sort.each do |source| -%>
+  <%=source-%>:
+<% @r10k_sources[source].sort.each do |key,value| -%>
+    <%=key-%>: "<%=value%>"
+<% end -%>
+<% end -%>
 <% end %>
 <%# The Array boxing/flattening ensures we don't get bitten by bug #15813 -%>
 <% unless [@purgedirs].flatten.empty? -%>

templates/webhook.erb

@@ -51,9 +51,12 @@ class Server  < Sinatra::Base
     raise Sinatra::NotFound
   end
 
-  post '/deploy' do
+  post '/payload' do
     protected!
-    deploy()
+    request.body.rewind  # in case someone already read it
+    data = JSON.parse request.body.read
+    branch = data['ref'].split("/").last
+    deploy(branch)
   end
 
   not_found do
@@ -66,7 +69,7 @@ class Server  < Sinatra::Base
         if USE_MCO
           mco()
         else
-          Process.detach(fork{ exec "#{DEPLOYCMD} &"}
+          Process.detach(fork{ exec "#{DEPLOYCMD} &"})
         end
         {:status => :success, :message => "Deploying environments."}.to_json
       rescue
@@ -80,7 +83,7 @@ class Server  < Sinatra::Base
      client = rpcclient('r10k', :exit_on_failure => false,:options => options)
      client.discovery_timeout = DISCOVER_TIMEOUT
      client.timeout           = CLIENT_TIMEOUT
-     result = client.send('sync',{})
+     result = client.send('deploy',branch)
    end # end deploy()
 
 
@@ -93,7 +96,7 @@ class Server  < Sinatra::Base
 
     def authorized?
       @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-      @auth.provided? && @auth.basic? && @auth.credentials && 
+      @auth.provided? && @auth.basic? && @auth.credentials &&
       @auth.credentials == [USER, PASS]
     end  #end authorized?
   end  #end helpers