third bootstrap phase: jenkins

Only after master-init, master-config and a restart of the
jenkins service, can the master-jenkins recipe actually
configure the jenkins install (which by then has the chef user + plugins)

Author: adriaanm

.chef/Vagrantfile

@@ -15,6 +15,7 @@ Vagrant.configure("2") do |config|
     # TODO: chef.encrypted_data_bag_secret_key_path
     chef.add_recipe("scala-jenkins-infra::master-init")
     chef.add_recipe("scala-jenkins-infra::master-config")
+    chef.add_recipe("scala-jenkins-infra::master-jenkins") # do not run on first provision -- must run up to master-config and allow jenkins to restart
   end
   config.vm.network "public_network"
   config.vm.provider "virtualbox" do |v|

recipes/_master-config-jenkins.rb

@@ -0,0 +1,40 @@
+#
+# Cookbook Name:: scala-jenkins-infra
+# Recipe:: _master-config-jenkins
+#
+# Copyright 2014, Typesafe, Inc.
+#
+# All rights reserved - Do Not Redistribute
+#
+
+# Config base Jenkins setup and restart
+ruby_block 'set private key' do
+  block do
+    node.run_state[:jenkins_private_key] = chef_vault_item("master", "scala-jenkins-keypair")['private_key']
+  end
+end
+
+## set up chef user with public key from our master/scala-jenkins-keypair vault
+template "#{node['jenkins']['master']['home']}/users/chef/config.xml" do
+  source 'chef-user-config.erb'
+  user node['jenkins']['master']['user']
+  group node['jenkins']['master']['group']
+
+  variables({
+    :pubkey => chef_vault_item("master", "scala-jenkins-keypair")['public_key']
+  })
+end
+
+%w(notification ssh-credentials groovy cygpath job-dsl build-flow-plugin rebuild greenballs build-timeout copyartifact email-ext slack throttle-concurrents dashboard-view parameterized-trigger).each do |plugin|
+  plugin, version = plugin.split('=') # in case we decide to pin versions later
+  jenkins_plugin plugin
+end
+
+jenkins_plugin "ec2-start-stop" do
+  source   node['master']['ec2-start-stop']['url']
+  # doesn't support checksum
+end
+
+jenkins_plugin "github-oauth" do
+  notifies :restart, 'runit_service[jenkins]', :immediately
+end

recipes/_master-config-auth-github.rb renamed to recipes/_master-jenkins-auth-github.rb

@@ -7,54 +7,14 @@
 # All rights reserved - Do Not Redistribute
 #
 
+# This recipe needs access to the vault, so can't be run on EC2 bootstrap (would be nice to fix)
 
-ruby_block 'set private key' do
-  block do
-    node.run_state[:jenkins_private_key] = chef_vault_item("master", "scala-jenkins-keypair")['private_key']
-  end
-end
-
-
-# nginx reverse proxy setup, in concert with JenkinsLocationConfiguration created in master-init
+# NGINX REVERSE PROXY setup, in concert with JenkinsLocationConfiguration created in master-init
 include_recipe 'scala-jenkins-infra::_master-config-proxy'
 
-# set up chef user with public key from our master/scala-jenkins-keypair vault
-template "#{node['jenkins']['master']['home']}/users/chef/config.xml" do
-  source 'chef-user-config.erb'
-  user node['jenkins']['master']['user']
-  group node['jenkins']['master']['group']
-
-  variables({
-    :pubkey => chef_vault_item("master", "scala-jenkins-keypair")['public_key']
-  })
-end
-
-%w(notification ssh-credentials groovy cygpath job-dsl build-flow-plugin rebuild greenballs build-timeout copyartifact email-ext slack throttle-concurrents dashboard-view parameterized-trigger).each do |plugin|
-  plugin, version = plugin.split('=') # in case we decide to pin versions later
-  jenkins_plugin plugin
-end
-
-jenkins_plugin "ec2-start-stop" do
-  source   node['master']['ec2-start-stop']['url']
-  # doesn't support checksum
-end
-
-jenkins_plugin "github-oauth" do
-end
-
-# this doesn't work
-# jenkins_command 'safe-restart' do
-#   action :nothing
-#   subscribes :execute, 'jenkins_plugin[github-oauth]', :delayed
-# end
-
-# NEED TO RESTART JENKINS BEFORE YOU CAN CONTINUE BRINGING UP JENKINS THE FIRST TIME
-include_recipe 'scala-jenkins-infra::_master-config-auth-github'
-
-include_recipe 'scala-jenkins-infra::_master-config-jobs'
-
-include_recipe 'scala-jenkins-infra::_master-config-workers'
+# Jenkins base config
+include_recipe 'scala-jenkins-infra::_master-config-jenkins'
 
-# NEEDS /usr/local/sbt
+# SCABOT
 include_recipe 'scala-jenkins-infra::_master-config-scabot'
 

recipes/_master-config-jobs.rb renamed to recipes/_master-jenkins-jobs.rb

@@ -0,0 +1,17 @@
+#
+# Cookbook Name:: scala-jenkins-infra
+# Recipe:: master-jenkins
+#
+# Copyright 2014, Typesafe, Inc.
+#
+# All rights reserved - Do Not Redistribute
+#
+
+# run after master-config + jenkins restart
+
+# ON FIRST PROVISION, MAKE SURE JENKINS HAS BEEN RESTARTED
+# Plugins don't take effect until that, so `_master-config-auth-github` would fail
+include_recipe 'scala-jenkins-infra::_master-jenkins-auth-github'
+include_recipe 'scala-jenkins-infra::_master-jenkins-jobs'
+include_recipe 'scala-jenkins-infra::_master-jenkins-workers'
+