diff --git a/data/export/launchd/launchd.plist.erb b/data/export/launchd/launchd.plist.erb index 56fc947..1731c4c 100644 --- a/data/export/launchd/launchd.plist.erb +++ b/data/export/launchd/launchd.plist.erb @@ -6,10 +6,10 @@ <%= "#{app}-#{name}-#{num}" %> EnvironmentVariables - <% engine.env.merge("PORT" => port).each_pair do |var,env| %> - <%= var.upcase %> - <%= env %> - <% end %> + <%- engine.env.merge("PORT" => port).each_pair do |var,env| -%> + <%= var.upcase %> + <%= env %> + <%- end -%> ProgramArguments diff --git a/lib/foreman/export/launchd.rb b/lib/foreman/export/launchd.rb index fd73681..4b9571f 100644 --- a/lib/foreman/export/launchd.rb +++ b/lib/foreman/export/launchd.rb @@ -7,6 +7,7 @@ class Foreman::Export::Launchd < Foreman::Export::Base super engine.each_process do |name, process| 1.upto(engine.formation[name]) do |num| + port = engine.port_for(process, num) write_template "launchd/launchd.plist.erb", "#{app}-#{name}-#{num}.plist", binding end end diff --git a/spec/resources/export/launchd/launchd-a.default b/spec/resources/export/launchd/launchd-a.default index bcbb8e8..80c731d 100644 --- a/spec/resources/export/launchd/launchd-a.default +++ b/spec/resources/export/launchd/launchd-a.default @@ -6,10 +6,8 @@ app-alpha-1 EnvironmentVariables - - PORT - 5000 - + PORT + 5000 ProgramArguments diff --git a/spec/resources/export/launchd/launchd-b.default b/spec/resources/export/launchd/launchd-b.default index ab7647f..da78927 100644 --- a/spec/resources/export/launchd/launchd-b.default +++ b/spec/resources/export/launchd/launchd-b.default @@ -6,10 +6,8 @@ app-bravo-1 EnvironmentVariables - - PORT - 5000 - + PORT + 5100 ProgramArguments