Moved configs around

software/config/deploy.rb → config/deploy.rb

@@ -13,8 +13,10 @@
 
 namespace :deploy do
 	task :fix_directories, :roles => :app do
-		run "mkdir /tmp/gatekeeper"
-		run "mv #{release_path}/software/* /tmp/gatekeeper/"
+		run "mkdir -p /tmp/gatekeeper/service"
+		run "mkdir -p /tmp/gatekeeper/site"
+		run "mv #{release_path}/software/* /tmp/gatekeeper/service"
+		run "mv #{release_path}/site/* /tmp/gatekeeper/site"
 		run "rm -rf #{release_path}/*"
 		run "rm -rf #{release_path}/.git"
 		run "rm -f #{release_path}/.gitignore"
@@ -23,7 +25,7 @@
 	end
 
 	task :copy_config, :roles => :app do
-		run "cp #{shared_path}/config.yml #{release_path}/config.yml"
+		run "cp #{shared_path}/database.yml #{release_path}/service/config/database.yml"
 	end
 end
 

software/servers/api_server.rb

@@ -1,4 +1,5 @@
 require 'mysql2'
+require 'json'
 require 'user'
 
 module Gatekeeper
@@ -64,7 +65,7 @@ def initialize(config)
 		#  - Door State
 
 		def fetch_all_doors
-			query(FETCH_ALL_DOORS).each(:symbolize_keys => true)
+			query(FETCH_ALL_DOORS).each.to_json
 		end
 
 

software/servers/http_server.rb

@@ -32,12 +32,12 @@ def receive_data(data)
 
 		def parse_request(uri)
 			uri = uri[1..-1].split('/')
-			uri[0] ||= 'index.html'
+			#uri[0] ||= 'index.html'
 			case uri[0]
-				when 'index.html'
-					File.open('views/index.html') do |page|
-						send_data(page.read)
-					end
+				#when 'index.html'
+				#	File.open('../site/views/index.html') do |page|
+				#		send_data(page.read)
+				#	end
 				when 'all_doors'
 					send_data(fetch_all_doors)
 				when 'door_state'
@@ -58,7 +58,7 @@ def parse_request(uri)
 					end
 				when 'favicon'
 				else
-					send_data('Unknown')
+					send_data('Invalid Command')
 			end
 			close_connection_after_writing
 		end