Index: modules/discourse/manifests/init.pp |
=================================================================== |
--- a/modules/discourse/manifests/init.pp |
+++ b/modules/discourse/manifests/init.pp |
@@ -1,15 +1,15 @@ |
class discourse inherits private::discourse { |
include postgresql::server |
postgresql::database {'discourse':} |
postgresql::role {'discourse': |
- password_hash => 'vagrant', |
+ password_hash => $database_password, |
db => 'discourse', |
login => true, |
superuser => true |
} |
package {['postgresql-contrib', 'redis-server', 'ruby1.9.1']: |
ensure => present |
} |
@@ -42,25 +42,27 @@ class discourse inherits private::discou |
owner => discourse, |
group => www-data |
} |
file {'/opt/discourse/config/database.yml': |
mode => 600, |
owner => discourse, |
group => www-data, |
- source => 'puppet:///modules/discourse/database.yml', |
+ content => template('discourse/database.yml.erb'), |
+ notify => Service['discourse-thin'], |
require => Exec['fetch-discourse'] |
} |
file {'/opt/discourse/config/redis.yml': |
mode => 600, |
owner => discourse, |
group => www-data, |
source => 'puppet:///modules/discourse/redis.yml', |
+ notify => Service['discourse-thin'], |
require => Exec['fetch-discourse'] |
} |
file {'/usr/local/bin/init-discourse': |
mode => 0755, |
owner => root, |
group => root, |
source => 'puppet:///modules/discourse/init-discourse' |