Skip to content
This repository has been archived by the owner on Aug 1, 2019. It is now read-only.

Commit

Permalink
Fixed location of storyboard configuration file
Browse files Browse the repository at this point in the history
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
  • Loading branch information
krotscheck committed Aug 8, 2014
1 parent 9763a66 commit 379a035
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions modules/storyboard/manifests/application.pp
Expand Up @@ -55,7 +55,7 @@
}

# Configure the StoryBoard API
file { '/etc/storyboard.conf':
file { '/etc/storyboard/storyboard.conf':
ensure => present,
owner => $storyboard::params::user,
group => $storyboard::params::group,
Expand Down Expand Up @@ -115,16 +115,16 @@

# 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'],
}
Expand Down
2 changes: 1 addition & 1 deletion modules/storyboard/manifests/load_projects.pp
Expand Up @@ -47,7 +47,7 @@
}

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],
Expand Down
2 changes: 1 addition & 1 deletion modules/storyboard/manifests/load_superusers.pp
Expand Up @@ -43,7 +43,7 @@
}

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],
Expand Down

0 comments on commit 379a035

Please sign in to comment.