Fixes for running latest boulder

Author: thoutenbos

CHANGELOG.md

@@ -1,6 +1,7 @@
-# x.y.z
+# 0.1.2
 
 * Added more specific platform version specification.
+* Get boulder git revision from attribute
 
 # 0.1.1
 
@@ -9,5 +10,4 @@
 # 0.1.0
 
 * Initial release of `letsencrypt-boulder-server`, based off
-  [`acme_server` test
-cookbook](https://github.com/schubergphilis/letsencrypt/tree/master/test/fixtures/cookbooks/acme_server).
+  [`acme_server` test cookbook](https://github.com/schubergphilis/letsencrypt/tree/master/test/fixtures/cookbooks/acme_server).

attributes/default.rb

@@ -1,3 +1,25 @@
+#
+# Author:: Thijs Houtenbos <[email protected]>
+# Cookbook:: chef-letsencrypt-boulder-server
+# Attribute:: default
+#
+# Copyright 2015 Schuberg Philis
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['boulder']['revision'] = 'master'
+
 default['boulder']['config']['boulder-config']['va']['portConfig']['httpPort'] = 80
 default['boulder']['config']['boulder-config']['va']['portConfig']['httpsPort'] = 443
 default['boulder']['config']['boulder-config']['va']['portConfig']['tlsPort'] = 443

metadata.rb

@@ -6,7 +6,7 @@
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 issues_url       'https://github.com/patcon/chef-letsencrypt-boulder-server/issues'
 source_url       'https://github.com/patcon/chef-letsencrypt-boulder-server'
-version          '0.1.1'
+version          '0.1.2'
 
 supports         'ubuntu', '= 14.04'
 supports         'centos', '~> 7'
@@ -16,3 +16,4 @@
 depends          'mariadb'
 depends          'build-essential'
 depends          'yum'
+depends          'hostsfile'

recipes/default.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Thijs Houtenbos <[email protected]>
-# Cookbook:: acme_server
+# Cookbook:: chef-letsencrypt-boulder-server
 # Recipe:: default
 #
 # Copyright 2015 Schuberg Philis
@@ -33,7 +33,7 @@
 end
 
 node.default['mariadb']['use_default_repository'] = true
-node.default['mariadb']['install']['version'] = '10.0'
+node.default['mariadb']['install']['version'] = '10.1'
 
 include_recipe 'build-essential'
 include_recipe 'mariadb::server'
@@ -45,6 +45,12 @@
   compile_time false
 end
 
+hostsfile_entry '127.0.0.1' do
+  hostname 'localhost'
+  aliases ['boulder', 'boulder-rabbitmq', 'boulder-mysql']
+  action :create
+end
+
 boulderdir = "#{node['go']['gopath']}/src/github.com/letsencrypt/boulder"
 
 directory ::File.dirname boulderdir do
@@ -53,7 +59,7 @@
 
 git boulderdir do
   repository 'https://github.com/letsencrypt/boulder'
-  revision '8e6f13f189d7e7feb0f5407a9a9c63f3b644f730'
+  revision node['boulder']['revision']
   action :checkout
 end
 
@@ -80,14 +86,14 @@
 bash 'boulder_setup' do
   live_stream true
   cwd boulderdir
-  code 'source /etc/profile.d/golang.sh && ./test/setup.sh 2>&1 && touch setup.done'
+  code 'source /etc/profile.d/golang.sh && GO15VENDOREXPERIMENT=1 ./test/setup.sh 2>&1 && touch setup.done'
   creates "#{boulderdir}/setup.done"
 end
 
 bash 'run_boulder' do
   live_stream true
   cwd boulderdir
-  code 'source /etc/profile.d/golang.sh && screen -LdmS boulder ./start.py'
+  code 'source /etc/profile.d/golang.sh && GO15VENDOREXPERIMENT=1 screen -LdmS boulder ./start.py'
   not_if 'screen -list boulder | /bin/grep 1\ Socket\ in'
 end