Moved config files to ./config

ndbroadbent · Mar 17, 2011 · 399e036 · 399e036
1 parent a2f38c8
commit 399e036
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/authorized_users.yml.sample → config/authorized_users.yml.sample b/authorized_users.yml.sample → config/authorized_users.yml.sample
diff --git a/user_radio_prefs.yml.sample → config/user_radio_prefs.yml.sample b/user_radio_prefs.yml.sample → config/user_radio_prefs.yml.sample
diff --git a/octopus_sinatra.rb b/octopus_sinatra.rb
@@ -16,7 +16,7 @@ def relative(filename)
 
 # Load $config.
 $config = YAML.load_file(relative("config/config.yml"))
-$users = YAML.load_file(relative("authorized_users.yml"))
+$users = YAML.load_file(relative("config/authorized_users.yml"))
 
 SwitchChannel = $config["SwitchChannel"]
 GreenChannel = $config["GreenChannel"]
@@ -101,7 +101,7 @@ def shellfm_trigger(name)
   # (and if the time is reasonable.)
   time = hk_time
   if time.hour >= 7 and time.hour <= 22
-    if radio_prefs = YAML.load_file(relative("user_radio_prefs.yml"))
+    if radio_prefs = YAML.load_file(relative("config/user_radio_prefs.yml"))
       if stations = radio_prefs[name]
         # Pick a random station, and play it.
         station = stations[rand(stations.size)]