Skip to content

Commit

Permalink
[COOK-3710] Make the winsw url a configurable attribute
Browse files Browse the repository at this point in the history
Signed-off-by: Seth Vargo <[email protected]>
  • Loading branch information
b-dean authored and sethvargo committed Oct 6, 2013
1 parent c6bf9d7 commit 5662036
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ Attributes
* `node['jenkins']['node']['ssh_private_key']` - Jenkins Master defaults to: `JENKINS_HOME/.ssh/id_rsa` (created by the `jenkins::server` recipe).
* `node['jenkins']['node']['jvm_options']` - Additional tuning parameters to pass the underlying JVM process.

### Windows Node/Slave related Attributes

* `node['jenkins']['node']['winsw_url']` - The url for the winsw exe to download.

Recipes
-------
Expand Down
1 change: 1 addition & 0 deletions attributes/node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

default['jenkins']['node']['service_user'] = 'LocalSystem'
default['jenkins']['node']['service_user_password'] = nil
default['jenkins']['node']['winsw_url'] = 'http://repo.jenkins-ci.org/releases/com/sun/winsw/winsw/1.13/winsw-1.13-bin.exe'
when 'mac_os_x'
default['jenkins']['node']['home'] = '/Users/jenkins'
default['jenkins']['node']['log_dir'] = '/var/log/jenkins'
Expand Down
2 changes: 1 addition & 1 deletion recipes/_node_windows.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
end

remote_file jenkins_exe do
source 'http://repo.jenkins-ci.org/releases/com/sun/winsw/winsw/1.13/winsw-1.13-bin.exe'
source node['jenkins']['node']['winsw_url']
not_if { File.exists?(jenkins_exe) }
end

Expand Down

0 comments on commit 5662036

Please sign in to comment.