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

Side by Side Diff: modules/discourse/manifests/init.pp

Issue 9432192: Make database password configurable (Closed)
Patch Set: Created Feb. 28, 2013, 12:40 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | modules/discourse/templates/database.yml.erb » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class discourse inherits private::discourse { 1 class discourse inherits private::discourse {
2 include postgresql::server 2 include postgresql::server
3 3
4 postgresql::database {'discourse':} 4 postgresql::database {'discourse':}
5 5
6 postgresql::role {'discourse': 6 postgresql::role {'discourse':
7 password_hash => 'vagrant', 7 password_hash => $database_password,
8 db => 'discourse', 8 db => 'discourse',
9 login => true, 9 login => true,
10 superuser => true 10 superuser => true
11 } 11 }
12 12
13 package {['postgresql-contrib', 'redis-server', 'ruby1.9.1']: 13 package {['postgresql-contrib', 'redis-server', 'ruby1.9.1']:
14 ensure => present 14 ensure => present
15 } 15 }
16 16
17 Exec {path => '/bin:/usr/bin:/usr/sbin:/usr/local/bin'} 17 Exec {path => '/bin:/usr/bin:/usr/sbin:/usr/local/bin'}
(...skipping 22 matching lines...) Expand all
40 ensure => directory, 40 ensure => directory,
41 mode => 755, 41 mode => 755,
42 owner => discourse, 42 owner => discourse,
43 group => www-data 43 group => www-data
44 } 44 }
45 45
46 file {'/opt/discourse/config/database.yml': 46 file {'/opt/discourse/config/database.yml':
47 mode => 600, 47 mode => 600,
48 owner => discourse, 48 owner => discourse,
49 group => www-data, 49 group => www-data,
50 source => 'puppet:///modules/discourse/database.yml', 50 content => template('discourse/database.yml.erb'),
51 notify => Service['discourse-thin'],
51 require => Exec['fetch-discourse'] 52 require => Exec['fetch-discourse']
52 } 53 }
53 54
54 file {'/opt/discourse/config/redis.yml': 55 file {'/opt/discourse/config/redis.yml':
55 mode => 600, 56 mode => 600,
56 owner => discourse, 57 owner => discourse,
57 group => www-data, 58 group => www-data,
58 source => 'puppet:///modules/discourse/redis.yml', 59 source => 'puppet:///modules/discourse/redis.yml',
60 notify => Service['discourse-thin'],
59 require => Exec['fetch-discourse'] 61 require => Exec['fetch-discourse']
60 } 62 }
61 63
62 file {'/usr/local/bin/init-discourse': 64 file {'/usr/local/bin/init-discourse':
63 mode => 0755, 65 mode => 0755,
64 owner => root, 66 owner => root,
65 group => root, 67 group => root,
66 source => 'puppet:///modules/discourse/init-discourse' 68 source => 'puppet:///modules/discourse/init-discourse'
67 } 69 }
68 70
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 source => 'puppet:///modules/discourse/intraforum.adblockplus.org', 276 source => 'puppet:///modules/discourse/intraforum.adblockplus.org',
275 enabled => true 277 enabled => true
276 } 278 }
277 279
278 file {'/etc/logrotate.d/nginx_intraforum.adblockplus.org': 280 file {'/etc/logrotate.d/nginx_intraforum.adblockplus.org':
279 ensure => file, 281 ensure => file,
280 require => Nginx::Hostconfig['intraforum.adblockplus.org'], 282 require => Nginx::Hostconfig['intraforum.adblockplus.org'],
281 source => 'puppet:///modules/discourse/logrotate' 283 source => 'puppet:///modules/discourse/logrotate'
282 } 284 }
283 } 285 }
OLDNEW
« 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