added endpoint /json

Author: leochen4891

cookbooks/bcpc/attributes/apache2.rb

@@ -1,13 +1,16 @@
-# bach web info page
+default['bcpc']['bach_web'].tap do |bach_web|
+  # bach web configs
+  bach_web['document_root'] = '/var/www/bach'
+  bach_web['port'] = 80
 
-default['bcpc']['bach_web']['document_root'] = '/var/www/bach'
-default['bcpc']['bach_web']['port'] = 80
+  # html portal page
+  bach_web['html_url'] = ''
+  bach_web['html_file'] = 'index.html'
 
-# { '<name>' => { 'port' => '<port_number>', 'desc' => '<description>' }, ... }
-default['bcpc']['bach_web']['services'] = {}
+  # json conf page file
+  bach_web['json_url'] = 'json'
+  bach_web['json_file'] = 'bach_web.json'
 
-# { '<name>' => { 'url' => '<port_number>', 'desc' => '<description>' }, ... }
-default['bcpc']['bach_web']['links'] = {}
-
-# { '<name>' => { 'path' => '<relative_path>', 'desc' => '<description>' }, ... }
-default['bcpc']['bach_web']['files'] = {}
+  # extra files to be exposed
+  bach_web['files_url'] = 'files'
+end

cookbooks/bcpc/recipes/apache2.rb

@@ -107,22 +107,32 @@
   mode 0o0644
 end
 
-# for providing information on services, links, and config files
+# bach web document root
 directory node['bcpc']['bach_web']['document_root'].to_s do
   owner 'root'
   group 'root'
   mode 0o0755
   action :create
 end
 
-directory "#{node['bcpc']['bach_web']['document_root']}/files" do
+# bach web configs
+template '/etc/apache2/sites-available/bach-web.conf' do
+  source 'bach-web.conf.erb'
   owner 'root'
   group 'root'
-  mode 0o0755
-  action :create
+  mode 0o0644
+  variables(
+    'host_ip'       => node['bcpc']['floating']['ip'],
+    'host_port'     => node['bcpc']['bach_web']['port'],
+    'document_root' => node['bcpc']['bach_web']['document_root'],
+    'json_url'      => node['bcpc']['bach_web']['json_url'],
+    'json_file'     => node['bcpc']['bach_web']['json_file']
+  )
+  notifies :restart, 'service[apache2]', :delayed
 end
 
-template "#{node['bcpc']['bach_web']['document_root']}/index.html" do
+# A portal html pages for useful links
+template "#{node['bcpc']['bach_web']['document_root']}/#{node['bcpc']['bach_web']['html_file']}" do
   source 'bach.html.erb'
   owner 'root'
   group 'root'
@@ -136,20 +146,22 @@
   notifies :restart, 'service[apache2]', :delayed
 end
 
-template '/etc/apache2/sites-available/bach-web.conf' do
-  source 'bach-web.conf.erb'
+# A json files that expose the configs for easier consumption programatically.
+# NOTE: node['bcpc']['bach_web'] should NOT contain anything sensitive or confidential 
+#       otherwise a dedicated hash should be used
+file "#{node['bcpc']['bach_web']['document_root']}/#{node['bcpc']['bach_web']['json_file']}" do
+  content Chef::JSONCompat.to_json_pretty(node['bcpc']['bach_web'].to_hash)
+end
+
+
+directory "#{node['bcpc']['bach_web']['document_root']}/files" do
   owner 'root'
   group 'root'
-  mode 0o0644
-  variables(
-    'host_ip'       => node['bcpc']['floating']['ip'],
-    'host_port'     => node['bcpc']['bach_web']['port'],
-    'document_root' => node['bcpc']['bach_web']['document_root'],
-    'files'         => node['bcpc']['bach_web']['files']
-  )
-  notifies :restart, 'service[apache2]', :delayed
+  mode 0o0755
+  action :create
 end
 
+# enable bach-web
 bash 'enable_bach_web' do
   user 'root'
   code 'a2ensite bach-web'

cookbooks/bcpc/templates/default/bach-web.conf.erb

@@ -5,15 +5,11 @@
 ################################################
 <VirtualHost <%= "#{@host_ip}:#{@host_port}" %>>
 
-  DocumentRoot "<%= @document_root %>"
+  DocumentRoot <%= @document_root %>
 
-  Alias /files <%= @document_root %>/files
-  <Directory <%= @document_root %>/files >
+  <Directory <%= @document_root %> >
     Options -Indexes
   </Directory>
 
-  <% (@files || {}).each do |file, values| %>
-  Alias /<%= values['path'] %> <%= @document_root %>/<%= values['path'] %>
-  <% end %>
-
+  Alias /<%= @json_url %> <%= @document_root %>/<%= @json_file %>
 </VirtualHost>