Using configuration directory

Signed-off-by: Russell Seymour <[email protected]>

Author: russellseymour

cookbooks/camsa/attributes/chefserver.rb

@@ -25,4 +25,7 @@
 default['camsa']['chefserver']['user']['statsd'] = 'statsd'
 
 # Set the path to the statsd js
-default['camsa']['chefserver']['statsd']['location'] = '/usr/local/lib/node_modules/statsd/stats.js'
+default['camsa']['chefserver']['statsd']['location'] = '/usr/local/lib/node_modules/statsd/stats.js'
+
+default['camsa']['chefserver']['file']['config'] = '/etc/opscode/chef-server.rb'
+default['camsa']['chefserver']['dir']['config'] = '/etc/opscode/conf.d'

cookbooks/camsa/files/default/chef-server.rb

@@ -0,0 +1,10 @@
+# Determine the current directory
+current_dir = File.expand_path(File.dirname(__FILE__))
+
+# Read in any configuration files in the conf.d, if it exists
+conf_d_dir = File.join(current_dir, 'conf.d')
+if File.exist?(conf_d_dir)
+  Dir.glob(File.join(conf_d_dir), "*.rb")).each do |conf|
+    Chef::Config.from_file(conf)
+  end
+end

cookbooks/camsa/libraries/chefserver_datacollector.rb

@@ -100,6 +100,7 @@ def create_secret
         end
 
         # Update the configuration file with these settings
+=begin        
         open('/etc/opscode/chef-server.rb', 'a') do |f|
           f.puts ''
           f.puts '# Setting data collector for Automate server'
@@ -108,6 +109,14 @@ def create_secret
           f.puts '# Setup access to CIS profiles in the Automate server'
           f.puts "profiles['root_url'] = 'https://%s'" % [node.run_state[:http_data]['automate_fqdn']]
         end
+=end        
+
+        template ::File.join(node['camsa']['chefserver']['dir']['config'], 'datacollector.rb') do
+          source 'datacollector.rb'
+          variables ({
+            automate_fqdn: lazy { node.run_state[:http_data]['automate_fqdn'] }
+          })
+        end
       end
     end
   end

cookbooks/camsa/libraries/chefserver_ssl.rb

@@ -20,6 +20,15 @@ class ChefServerSSL < CAMSABase
       # Only proceed if the certificate and key file exist
       if ::File.exist?(new_resource.cert_path) && ::File.exist?(new_resource.cert_key_path)
 
+        template ::File.join(node['camsa']['chefserver']['dir']['config'], 'chefssl.rb') do
+          source 'chefssl.rb'
+          variables({
+            cert_path: new_resource.cert_path,
+            cert_key_path: new_resource.cert_key_path
+          })
+        end
+
+=begin
         append_if_no_line "ssl_certificate" do
           path new_resource.cert_path
           line 'echo nginx["ssl_certificate"] = "%s"' % [new_resource.cert_path]
@@ -34,6 +43,7 @@ class ChefServerSSL < CAMSABase
           code "chef-server-ctl reconfigure"
           subscribes :run, "file[#{new_resource.config_file}]", :immediately
         end
+=end
       end
     end
   end

cookbooks/camsa/recipes/certificate.rb

@@ -42,8 +42,4 @@
   automate_ssl 'ssl_patch' do
     only_if { node['camsa']['managed_app'] && node['camsa']['deploy']['automate'] }
   end
-
-  chefserver_ssl 'ssl_certificate' do
-    only_if { node['camsa']['managed_app'] && !node['camsa']['deploy']['automate'] && node['camsa']['deploy']['chefserver'] }
-  end
 end

cookbooks/camsa/recipes/chefserver.rb

@@ -0,0 +1,32 @@
+#
+# Recipe to configure the chef server when it is run as a separate machine
+#
+
+if !node['camsa']['deploy']['automate'] &&
+   node['camsa']['deploy']['chefserver']
+
+  camsa_config_store 'automate_fqdn' do
+    action :retrieve
+  end
+
+  directory node['camsa']['chefserver']['dir']['config'] do
+    recursive true
+  end
+
+  # Write out the configuration file that will read all files in from the config dir
+  cookbook_file node['camsa']['chefserver']['file']['config'] do
+    source 'chef-server.rb'
+  end
+  
+  chefserver_datacollector 'chef_automate_token' do
+    recursive true
+
+    notifies :run, 'bash[chef_reconfigure]', :delayed
+  end
+
+  chefserver_ssl 'ssl_certificate' do
+    notifies :run, 'bash[chef_reconfigure]', :delayed
+  end
+
+
+end

cookbooks/camsa/recipes/install.rb

@@ -140,11 +140,11 @@
     action :install
     source target
 
-    notifies :run, "bash[initial_chef_infra_server_config]", :immediately
+    notifies :run, "bash[chef_reconfigure]", :immediately
   end
 
   # Run command to install chef infra server
-  bash 'initial_chef_infra_server_config' do
+  bash 'chef_reconfigure' do
     code "chef-server-ctl reconfigure"
     environment ({
       CHEF_LICENSE: "accept"

cookbooks/camsa/recipes/integrate.rb

@@ -0,0 +1,3 @@
+# Configure SSL key and cert for Chef Server
+nginx["ssl_certificate"] = "<%= @cert_path %>"
+nginx["ssl_certificate_key"] = "<%= @cert_key_path %>"

cookbooks/camsa/templates/default/chefssl.rb

@@ -0,0 +1,5 @@
+# Setting data collector for the Automate server
+data_collector['root_url'] = "https://<%= @automate_fqdn %>/v0/"
+
+# Setup path to the CIS profiles in the Automate server
+profiles['root_url'] = "https://<%= @automate_fqdn %>"