gocd#50 support installation from custom repository or package file

Refactored adding apt or rpm repository to separate recipe intead of
repeating code in agent and server recipe

Added possible installation from remote_file.

Default install method is still thoughtworks repository

Updated and fixed readme

Author: tomzo

README.md

@@ -1,10 +1,44 @@
 # Go Cookbook
 
 Hello friend! This cookbook is here to help you setup Go servers and agents
-in an automated way. 
+in an automated way.
 
 It's primarily tested on newer versions of Ubuntu, but should work on both Debian and Red Hat based distributions.  There is also basic support for agents on Windows (enhancements appreciated!).
 
+## Install method
+
+### Repository
+
+By default installation source is done from apt or yum repositories from official sources at http://www.go.cd/download/.
+
+The **apt** repository can be overriden by changing any these attributes:
+```ruby
+default['go']['repository']['apt']['uri'] = 'http://download.go.cd/gocd-deb/'
+default['go']['repository']['apt']['components'] = [ '/' ]
+default['go']['repository']['apt']['package_options'] = '--force-yes'
+default['go']['repository']['apt']['keyserver'] = 'pgp.mit.edu'
+default['go']['repository']['apt']['key'] = '0x9149B0A6173454C7'
+```
+The **yum** repository can be overriden by changing any these attributes:
+```ruby
+default['go']['repository']['yum']['baseurl'] = 'http://download.go.cd/gocd-rpm'
+default['go']['repository']['yum']['gpgcheck'] = false
+```
+
+### From remote file
+
+Cookbook can skip adding repository and install Go server or agent by downloading a remote file and install it directly via `dpkg` or `rpm`.
+
+Change install method to 'package_file':
+```ruby
+node['go']['install_method'] = 'remote_file'
+```
+
+And assign base url where packages are available for download
+```ruby
+node['go']['package_file']['baseurl'] = 'http://my/custom/url'
+```
+The final download URL of file is built based on platform and `node['go']['version']`. E.g. `http://my/custom/url/go-agent-15.2.0-2520.deb`
 
 ## Ideas
 
@@ -33,10 +67,11 @@ You can use Vagrant and your own chef bootstrapped virtual box base image and va
 go recipe will install and configure a Windows Go agent on a Windows os, and associate it with an existing Go server.  Does not automatically register agent.
 
 Overrides available for go::agent_windows
-[:go][:agent][:server_host] - hostname or ip of Go server
-[:go][:agent][:install_path] - installation path for Go agent
-[:go][:agent][:java_home] - java home path if using existing java installation
-[:go][:agent][:download_url] - msi for agent install, if left empty will build download url using [:go][:version]
+ * `node[:go][:agent][:server_host]` - hostname or ip of Go server
+ * `node[:go][:agent][:install_path]` - installation path for Go agent
+ * `node[:go][:agent][:java_home]` - java home path if using existing java installation
+ * `node[:go][:agent][:download_url]` - msi for agent install, if left empty will build download url using `node[:go][:version]`
+
 
 # Authors
 Author:: Chris Kozak (<ckozak@gmail.com>)

attributes/default.rb

@@ -11,7 +11,7 @@
 default['go']['agent']['instance_count'] = node['cpu']['total']
 default['go']['agent']['server_search_query'] =
   "chef_environment:#{node.chef_environment} AND recipes:go\\:\\:server"
-  
+
 
 default['go']['version']                       = '14.3.0-1186'
 
@@ -20,4 +20,36 @@
   default['go']['agent']['work_dir_path']         = '/var/lib'
 end
 
-default['go']['server']['install_path'] = 'C:\Program Files (x86)\Go Server'
+default['go']['server']['install_path'] = 'C:\Program Files (x86)\Go Server'
+
+default['go']['install_method'] = 'repository'
+
+default['go']['repository']['apt']['uri'] = 'http://download.go.cd/gocd-deb/'
+default['go']['repository']['apt']['components'] = [ '/' ]
+default['go']['repository']['apt']['package_options'] = '--force-yes'
+default['go']['repository']['apt']['keyserver'] = 'pgp.mit.edu'
+default['go']['repository']['apt']['key'] = '0x9149B0A6173454C7'
+
+default['go']['repository']['yum']['baseurl'] = 'http://download.go.cd/gocd-rpm'
+default['go']['repository']['yum']['gpgcheck'] = false
+
+version = node['go']['version']
+case node['platform_family']
+when 'debian'
+  default['go']['server']['package_file']['filename'] = "go-server-#{version}.deb"
+  default['go']['agent']['package_file']['filename'] = "go-agent-#{version}.deb"
+  default['go']['package_file']['baseurl'] = 'http://download.go.cd/gocd-deb/'
+when 'rhel','fedora'
+  default['go']['server']['package_file']['filename'] = "go-server-#{version}.noarch.rpm"
+  default['go']['agent']['package_file']['filename'] = "go-agent-#{version}.noarch.rpm"
+  default['go']['package_file']['baseurl'] = 'http://download.go.cd/gocd-rpm/'
+end
+
+default['go']['server']['package_file']['path'] =
+  File.join(Chef::Config[:file_cache_path], node['go']['server']['package_file']['filename'])
+default['go']['server']['package_file']['url'] =
+  "#{node['go']['package_file']['baseurl']}/#{node['go']['server']['package_file']['filename']}"
+default['go']['agent']['package_file']['path'] =
+  File.join(Chef::Config[:file_cache_path], node['go']['agent']['package_file']['filename'])
+default['go']['agent']['package_file']['url'] =
+  "#{node['go']['package_file']['baseurl']}/#{node['go']['agent']['package_file']['filename']}"

recipes/agent_linux.rb

@@ -1,38 +1,40 @@
 # Cookbook Name:: go
 # Recipe:: agent_linux
 
-case node['platform_family']
-when 'debian'
-  include_recipe 'apt'
-
-  apt_repository 'thoughtworks' do
-    uri 'http://dl.bintray.com/gocd/gocd-deb/'
-    keyserver "pgp.mit.edu"
-    key "0x9149B0A6173454C7"
-    components ['/']
-  end
-
-  package_options = '--force-yes'
-when 'rhel','fedora'
-  include_recipe 'yum'
-
-  yum_repository 'thoughtworks' do
-    baseurl 'http://dl.bintray.com/gocd/gocd-rpm/'
-    gpgcheck false
-  end
-end
+include_recipe 'go::repository'
 
 include_recipe 'java'
 
-package_url             = node['go']['agent']['package_url']
-package_checksum        = node['go']['agent']['package_checksum']
 go_server_autoregister  = node['go']['agent']['auto_register']
 autoregister_key        = node['go']['agent']['auto_register_key']
 server_search_query     = node['go']['agent']['server_search_query']
 
-package "go-agent" do
-  version node['go']['version']
-  options package_options
+case node['go']['install_method']
+when 'repository'
+  include_recipe 'go::repository'
+  package_options = node['go']['repository']['apt']['package_options'] if node['platform_family'] == 'debian'
+  package "go-agent" do
+    version node['go']['version']
+    options package_options
+  end
+when 'package_file'
+  remote_file node['go']['agent']['package_file']['filename'] do
+    path node['go']['agent']['package_file']['path']
+    source node['go']['agent']['package_file']['url']
+    mode 0644
+  end
+  case node['platform_family']
+  when 'debian'
+    dpkg_package 'go-agent' do
+      source node['go']['agent']['package_file']['path']
+    end
+  when 'rhel','fedora'
+    rpm_package 'go-agent' do
+      source node['go']['agent']['package_file']['path']
+    end
+  end
+else
+  fail "Unknown install method - '#{node['go']['install_method']}'"
 end
 
 # If running under solo or user specifed the server host, try and use that
@@ -91,7 +93,7 @@
   else
     suffix = "-#{i}"
   end
-  
+
   template "/etc/init.d/go-agent#{suffix}" do
     # <%= @go_agent_instance -%>
     source 'go-agent-service.erb'
@@ -106,12 +108,12 @@
     mode '0644'
     owner 'go'
     group 'go'
-    variables(:go_server_host => go_server_host, 
-      :go_server_port => '8153', 
+    variables(:go_server_host => go_server_host,
+      :go_server_port => '8153',
       :java_home => node['java']['java_home'],
       :work_dir => "#{node['go']['agent']['work_dir_path']}/go-agent#{suffix}")
   end
-  
+
   template "/usr/share/go-agent/agent#{suffix}.sh" do
     source 'go-agent-sh.erb'
     mode '0755'
@@ -139,7 +141,7 @@
     owner 'go'
     group 'go'
   end
-  
+
   autoregister_resources = []
   node['go']['agent']['auto_register_resources'].each do |resource_key|
     autoregister_resources.push(resource_key)
@@ -175,4 +177,4 @@
     subscribes :restart, "template[/var/lib/go-agent#{suffix}/config/autoregister.properties]"
     subscribes :restart, "template[/etc/default/go-agent#{suffix}]"
   end
-end
+end

recipes/repository.rb

@@ -0,0 +1,17 @@
+case node['platform_family']
+when 'debian'
+  include_recipe 'apt'
+
+  apt_repository 'thoughtworks' do
+    uri node['go']['repository']['apt']['uri']
+    keyserver node['go']['repository']['apt']['keyserver']
+    key node['go']['repository']['apt']['key']
+    components node['go']['repository']['apt']['components']
+  end
+when 'rhel','fedora'
+  include_recipe 'yum'
+  yum_repository 'thoughtworks' do
+    baseurl node['go']['repository']['yum']['baseurl']
+    gpgcheck node['go']['repository']['yum']['gpgcheck']
+  end
+end

recipes/server_linux.rb

@@ -1,46 +1,50 @@
-case node['platform_family']
-when 'debian'
-  include_recipe 'apt'
-
-  apt_repository 'thoughtworks' do
-    uri 'http://download.go.cd/gocd-deb/'
-    components ['/']
-  end
-
-  package_options = '--force-yes'
-when 'rhel','fedora'
-  include_recipe 'yum'
-
-  yum_repository 'thoughtworks' do
-    baseurl 'http://download.go.cd/gocd-rpm'
-    gpgcheck false
-  end
-end
-
 include_recipe 'java'
 
 package 'unzip'
 
-package "go-server" do
-  version node['go']['version']
-  options package_options
-  notifies :start, 'service[go-server]', :immediately
+case node['go']['install_method']
+when 'repository'
+  include_recipe 'go::repository'
+  package_options = node['go']['repository']['apt']['package_options'] if node['platform_family'] == 'debian'
+  package "go-server" do
+    version node['go']['version']
+    options package_options
+    notifies :start, 'service[go-server]', :immediately
+  end
+when 'package_file'
+  remote_file node['go']['server']['package_file']['filename'] do
+    path node['go']['server']['package_file']['path']
+    source node['go']['server']['package_file']['url']
+    mode 0644
+  end
+  case node['platform_family']
+  when 'debian'
+    dpkg_package 'go-server' do
+      source node['go']['server']['package_file']['path']
+    end
+  when 'rhel','fedora'
+    rpm_package 'go-server' do
+      source node['go']['server']['package_file']['path']
+    end
+  end
+else
+  fail "Unknown install method - '#{node['go']['install_method']}'"
 end
 
-# If we're upgrading an existing Go Server then leave the configuration and such intact. 
+# If we're upgrading an existing Go Server then leave the configuration and such intact.
 # If it's a new node, and a SVN backup URL is specified then restore/overwrite any existing configuration.
 
-# Detection isn't based on the <license> element as Go-Community edition has no license. 
+# Detection isn't based on the <license> element as Go-Community edition has no license.
 # We look for at least one <pipelines> element, with the assumption that if you have a backup you have at least one pipeline.
 
-if (::File.exists?('/etc/go/cruise-config.xml') and ::File.readlines('/etc/go/cruise-config.xml').grep(/<pipelines/).length > 0) 
+if (::File.exists?('/etc/go/cruise-config.xml') and ::File.readlines('/etc/go/cruise-config.xml').grep(/<pipelines/).length > 0)
   skip_backup = true
   Chef::Log.warn("Existing configuration detected. Restore skipped.")
 else
   Chef::Log.warn("New install detected.")
   skip_backup = false
   restore_go_config = false
-  if (node['go']['backup_path'] && !node['go']['backup_path'].strip.empty?) 
+  if (node['go']['backup_path'] && !node['go']['backup_path'].strip.empty?)
     Chef::Log.warn("Backup URL specified. Configuration will be restored.")
     restore_go_config = true
   end