diff --git a/site-cookbooks/kosmos-base/metadata.rb b/site-cookbooks/kosmos-base/metadata.rb index 50136a2..d59a182 100644 --- a/site-cookbooks/kosmos-base/metadata.rb +++ b/site-cookbooks/kosmos-base/metadata.rb @@ -14,3 +14,4 @@ depends 'hostname' depends 'firewall' depends 'chef_client_updater' depends 'timezone-ii' +depends 'ntp' diff --git a/site-cookbooks/kosmos-base/recipes/default.rb b/site-cookbooks/kosmos-base/recipes/default.rb index 25704cd..8b65e93 100644 --- a/site-cookbooks/kosmos-base/recipes/default.rb +++ b/site-cookbooks/kosmos-base/recipes/default.rb @@ -9,6 +9,7 @@ include_recipe 'apt' include_recipe 'timezone-ii' +include_recipe 'ntp' # Update chef to the chosen version chef_version = '12.19.36' @@ -39,29 +40,29 @@ unless node.chef_environment == "development" ] node.override['authorization']['sudo']['passwordless'] = true include_recipe 'sudo' -end -include_recipe 'kosmos-postfix' + include_recipe 'kosmos-base::firewall' -node.override['set_fqdn'] = '*' -include_recipe 'hostname' + include_recipe 'kosmos-postfix' -include_recipe 'kosmos-base::firewall' + node.override['set_fqdn'] = '*' + include_recipe 'hostname' -package 'ca-certificates' + package 'ca-certificates' -directory '/usr/local/share/ca-certificates/cacert' do - action :create -end + directory '/usr/local/share/ca-certificates/cacert' do + action :create + end -['http://www.cacert.org/certs/root.crt', 'http://www.cacert.org/certs/class3.crt'].each do |cert| - remote_file "/usr/local/share/ca-certificates/cacert/#{File.basename(cert)}" do - source cert - action :create_if_missing - notifies :run, 'execute[update-ca-certificates]', :immediately + ['http://www.cacert.org/certs/root.crt', 'http://www.cacert.org/certs/class3.crt'].each do |cert| + remote_file "/usr/local/share/ca-certificates/cacert/#{File.basename(cert)}" do + source cert + action :create_if_missing + notifies :run, 'execute[update-ca-certificates]', :immediately + end + end + + execute 'update-ca-certificates' do + action :nothing end end - -execute 'update-ca-certificates' do - action :nothing -end