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

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

Issue 9437206: Fix dependencies (Closed)
Patch Set: Created Feb. 28, 2013, 8:14 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 | no next file » | 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 => $database_password, 7 password_hash => $database_password,
8 db => 'discourse', 8 db => 'discourse',
9 login => true, 9 login => true,
10 superuser => true 10 superuser => true,
11 require => Postgresql::Database['discourse']
11 } 12 }
12 13
13 package {['postgresql-contrib', 'redis-server', 'ruby1.9.1']: 14 package {['postgresql-contrib', 'redis-server', 'ruby1.9.1']:
14 ensure => present 15 ensure => present
15 } 16 }
16 17
17 Exec {path => '/bin:/usr/bin:/usr/sbin:/usr/local/bin'} 18 Exec {path => '/bin:/usr/bin:/usr/sbin:/usr/local/bin'}
18 19
19 exec {'update-alternatives --set ruby "/usr/bin/ruby1.9.1"': 20 exec {'update-alternatives --set ruby "/usr/bin/ruby1.9.1"':
20 unless => 'test $(readlink "/etc/alternatives/ruby") == "/usr/bin/ruby1.9.1" ', 21 unless => 'test $(readlink "/etc/alternatives/ruby") == "/usr/bin/ruby1.9.1" ',
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 refreshonly => true, 101 refreshonly => true,
101 environment => ["DISCOURSE_SECRET=${secret}", "AIRBRAKE_KEY=${airbrake_key}" ], 102 environment => ["DISCOURSE_SECRET=${secret}", "AIRBRAKE_KEY=${airbrake_key}" ],
102 user => discourse, 103 user => discourse,
103 group => www-data, 104 group => www-data,
104 timeout => 0, 105 timeout => 0,
105 logoutput => true, 106 logoutput => true,
106 require => [Package['bundler', 'postgresql-contrib', $gem_dependencies], 107 require => [Package['bundler', 'postgresql-contrib', $gem_dependencies],
107 User['discourse'], File['/etc/sudoers.d/discourse'], 108 User['discourse'], File['/etc/sudoers.d/discourse'],
108 Exec['fetch-discourse'], 109 Exec['fetch-discourse'],
109 File['/opt/discourse/config/database.yml'], 110 File['/opt/discourse/config/database.yml'],
110 File['/opt/discourse/config/redis.yml']] 111 File['/opt/discourse/config/redis.yml'],
112 Postgresql::Role['discourse']]
111 } 113 }
112 114
113 Discourse::Sitesetting <| |> { 115 Discourse::Sitesetting <| |> {
114 require => Exec['/usr/local/bin/init-discourse'] 116 require => Exec['/usr/local/bin/init-discourse']
115 } 117 }
116 118
117 discourse::sitesetting {'title': 119 discourse::sitesetting {'title':
118 ensure => present, 120 ensure => present,
119 type => 1, 121 type => 1,
120 value => 'Adblock Plus internal discussions' 122 value => 'Adblock Plus internal discussions'
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 source => 'puppet:///modules/discourse/intraforum.adblockplus.org', 278 source => 'puppet:///modules/discourse/intraforum.adblockplus.org',
277 enabled => true 279 enabled => true
278 } 280 }
279 281
280 file {'/etc/logrotate.d/nginx_intraforum.adblockplus.org': 282 file {'/etc/logrotate.d/nginx_intraforum.adblockplus.org':
281 ensure => file, 283 ensure => file,
282 require => Nginx::Hostconfig['intraforum.adblockplus.org'], 284 require => Nginx::Hostconfig['intraforum.adblockplus.org'],
283 source => 'puppet:///modules/discourse/logrotate' 285 source => 'puppet:///modules/discourse/logrotate'
284 } 286 }
285 } 287 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld