Use node["..."] directly in templates

... rather than using template variables

Author: adriaanm

recipes/_master-init-jenkins.rb

@@ -33,8 +33,4 @@
   source 'jenkins.model.JenkinsLocationConfiguration.xml.erb'
   user node['jenkins']['master']['user']
   group node['jenkins']['master']['group']
-  variables({
-    :adminAddress => node['master']['adminAddress'],
-    :jenkinsUrl   => node['master']['jenkinsUrl']
-  })
 end

templates/default/jenkins.model.JenkinsLocationConfiguration.xml.erb

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <jenkins.model.JenkinsLocationConfiguration>
-  <adminAddress><%= @adminAddress %></adminAddress>
-  <jenkinsUrl><%= @jenkinsUrl %></jenkinsUrl>
+  <adminAddress><%= node['master']['adminAddress'] %></adminAddress>
+  <jenkinsUrl><%= node['master']['jenkinsUrl'] %></jenkinsUrl>
 </jenkins.model.JenkinsLocationConfiguration>

templates/default/nginx-jenkins.conf

@@ -2,7 +2,7 @@ limit_req_zone $binary_remote_addr zone=one:10m rate=1000r/s;
 
 # based on https://wiki.jenkins-ci.org/display/JENKINS/Jenkins+behind+an+NGinX+reverse+proxy
 upstream jenkins {
-  server 127.0.0.1:8080 fail_timeout=0;
+  server 127.0.0.1:<%=node['jenkins']['master']['port']%> fail_timeout=0;
 }
 
 server {