From 79fe352c7cfa91078de62ce8399b9c03352c846e Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Fri, 8 Aug 2014 13:32:36 -0700
Subject: [PATCH] Fixed location of storyboard configuration file

For some reason, storyboard's config is again trying to read from
/etc/storyboard/storyboard.conf rather than /etc/storyboard.conf. This
fixes our configuration.

Change-Id: I978b8cd99744fabfab7fdf5b1d63bd54396350ed
---
 manifests/application.pp     | 8 ++++----
 manifests/load_projects.pp   | 2 +-
 manifests/load_superusers.pp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/application.pp b/manifests/application.pp
index ae8efc3..1e80147 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -55,7 +55,7 @@ class storyboard::application (
   }
 
   # Configure the StoryBoard API
-  file { '/etc/storyboard.conf':
+  file { '/etc/storyboard/storyboard.conf':
     ensure  => present,
     owner   => $storyboard::params::user,
     group   => $storyboard::params::group,
@@ -115,16 +115,16 @@ class storyboard::application (
 
   # Migrate the database
   exec { 'migrate-storyboard-db':
-    command     => 'storyboard-db-manage --config-file /etc/storyboard.conf upgrade head',
+    command     => 'storyboard-db-manage --config-file /etc/storyboard/storyboard.conf upgrade head',
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => [
       Exec['install-storyboard'],
-      File['/etc/storyboard.conf'],
+      File['/etc/storyboard/storyboard.conf'],
     ],
     require     => [
       Class['mysql::python'],
-      File['/etc/storyboard.conf'],
+      File['/etc/storyboard/storyboard.conf'],
     ],
     notify      => Service['httpd'],
   }
diff --git a/manifests/load_projects.pp b/manifests/load_projects.pp
index 30dd095..f9bec3e 100644
--- a/manifests/load_projects.pp
+++ b/manifests/load_projects.pp
@@ -47,7 +47,7 @@ class storyboard::load_projects (
   }
 
   exec { 'load-projects-yaml':
-    command     => "storyboard-db-manage --config-file /etc/storyboard.conf load_projects ${project_file_path}",
+    command     => "storyboard-db-manage --config-file /etc/storyboard/storyboard.conf load_projects ${project_file_path}",
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => File[$project_file_path],
diff --git a/manifests/load_superusers.pp b/manifests/load_superusers.pp
index 68a8d32..6c563a2 100644
--- a/manifests/load_superusers.pp
+++ b/manifests/load_superusers.pp
@@ -43,7 +43,7 @@ class storyboard::load_superusers (
   }
 
   exec { 'load-superusers-yaml':
-    command     => "storyboard-db-manage --config-file /etc/storyboard.conf load_superusers ${superuser_file_path}",
+    command     => "storyboard-db-manage --config-file /etc/storyboard/storyboard.conf load_superusers ${superuser_file_path}",
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => File[$superuser_file_path],