From 7f5daaeaac895893fdef1ed1d5235982540068b1 Mon Sep 17 00:00:00 2001
From: "OHASHI, Norikazu" <katz@neko-mori.sakura.ne.jp>
Date: Thu, 21 Mar 2019 16:19:28 +0900
Subject: [PATCH] =?utf8?q?CGI=E3=81=A7=E3=82=82=E5=8B=95=E4=BD=9C=E3=81=99?=
 =?utf8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=97?=
 =?utf8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 sinatra/{ => app/models}/database.yml | 0
 sinatra/app/models/users_db.rb        | 3 ++-
 sinatra/start.rb                      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename sinatra/{ => app/models}/database.yml (100%)

diff --git a/sinatra/database.yml b/sinatra/app/models/database.yml
similarity index 100%
rename from sinatra/database.yml
rename to sinatra/app/models/database.yml
diff --git a/sinatra/app/models/users_db.rb b/sinatra/app/models/users_db.rb
index 151e1e5..2bb0ec3 100644
--- a/sinatra/app/models/users_db.rb
+++ b/sinatra/app/models/users_db.rb
@@ -5,7 +5,8 @@ require 'mysql2'
 require 'bcrypt'
 
 # DB設定ファイルの読み込み
-ActiveRecord::Base.configurations = YAML.load_file('database.yml')
+db_config = File.join(File.dirname(__FILE__), 'database.yml')
+ActiveRecord::Base.configurations = YAML.load_file(db_config)
 ActiveRecord::Base.establish_connection(:development)
 
 class Users < ActiveRecord::Base
diff --git a/sinatra/start.rb b/sinatra/start.rb
index d2e48f2..73971e8 100644
--- a/sinatra/start.rb
+++ b/sinatra/start.rb
@@ -1,5 +1,5 @@
 require 'sinatra/base'
-require './app/controllers/web_gui'
+require_relative './app/controllers/web_gui'
 # require 'app/controllers/restful_api'
 
 class Main < Sinatra::Base
-- 
2.19.2