Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/discourse/manifests/init.pp

Issue 9432192: Make database password configurable (Closed)
Patch Set: Created Feb. 28, 2013, 12:40 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | modules/discourse/templates/database.yml.erb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'
« no previous file with comments | « no previous file | modules/discourse/templates/database.yml.erb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld