| OLD | NEW |
| 1 class discourse( | 1 class discourse( |
| 2 $domain, | 2 $domain, |
| 3 $certificate, | 3 $certificate, |
| 4 $private_key, | 4 $private_key, |
| 5 $is_default = false | 5 $is_default = false |
| 6 ) inherits private::discourse { | 6 ) inherits private::discourse { |
| 7 | 7 |
| 8 include postgresql::server | 8 class {"postgresql::server":} |
| 9 | 9 |
| 10 postgresql::database {'discourse':} | 10 postgresql::server::database {'discourse':} |
| 11 | 11 |
| 12 postgresql::role {'discourse': | 12 postgresql::server::role {'discourse': |
| 13 password_hash => $database_password, | 13 password_hash => $database_password, |
| 14 db => 'discourse', | 14 db => 'discourse', |
| 15 login => true, | 15 login => true, |
| 16 superuser => true, | 16 superuser => true, |
| 17 require => Postgresql::Database['discourse'] | 17 require => Postgresql::Server::Database['discourse'] |
| 18 } | 18 } |
| 19 | 19 |
| 20 $basic_dependencies = ['postgresql-contrib', 'redis-server', 'ruby1.9.1', | 20 $basic_dependencies = ['postgresql-contrib', 'redis-server', 'ruby1.9.1', |
| 21 'libjemalloc1', 'curl'] | 21 'libjemalloc1', 'curl'] |
| 22 $gem_dependencies = ['git', 'build-essential', 'ruby1.9.1-dev', 'libxml2-dev', | 22 $gem_dependencies = ['git', 'build-essential', 'ruby1.9.1-dev', 'libxml2-dev', |
| 23 'libxslt-dev', 'libpq-dev'] | 23 'libxslt-dev', 'libpq-dev'] |
| 24 $image_optim_dependencies = ['advancecomp', 'gifsicle', 'jhead', 'jpegoptim', | 24 $image_optim_dependencies = ['advancecomp', 'gifsicle', 'jhead', 'jpegoptim', |
| 25 'libjpeg-progs', 'optipng', 'pngcrush'] | 25 'libjpeg-progs', 'optipng', 'pngcrush'] |
| 26 $image_sorcery_dependencies = 'imagemagick' | 26 $image_sorcery_dependencies = 'imagemagick' |
| 27 | 27 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 refreshonly => true, | 118 refreshonly => true, |
| 119 environment => ["AIRBRAKE_KEY=${airbrake_key}"], | 119 environment => ["AIRBRAKE_KEY=${airbrake_key}"], |
| 120 user => discourse, | 120 user => discourse, |
| 121 group => www-data, | 121 group => www-data, |
| 122 timeout => 0, | 122 timeout => 0, |
| 123 logoutput => true, | 123 logoutput => true, |
| 124 require => [Package['bundler', $gem_dependencies], | 124 require => [Package['bundler', $gem_dependencies], |
| 125 User['discourse'], File['/etc/sudoers.d/discourse'], | 125 User['discourse'], File['/etc/sudoers.d/discourse'], |
| 126 Exec['fetch-discourse'], | 126 Exec['fetch-discourse'], |
| 127 File['/opt/discourse/config/discourse.conf'], | 127 File['/opt/discourse/config/discourse.conf'], |
| 128 Postgresql::Role['discourse']] | 128 Postgresql::Server::Role['discourse']] |
| 129 } | 129 } |
| 130 | 130 |
| 131 Discourse::Sitesetting <| |> { | 131 Discourse::Sitesetting <| |> { |
| 132 require => Exec['/usr/local/bin/init-discourse'] | 132 require => Exec['/usr/local/bin/init-discourse'] |
| 133 } | 133 } |
| 134 | 134 |
| 135 discourse::sitesetting {'title': | 135 discourse::sitesetting {'title': |
| 136 ensure => present, | 136 ensure => present, |
| 137 type => 1, | 137 type => 1, |
| 138 value => 'Adblock Plus internal discussions' | 138 value => 'Adblock Plus internal discussions' |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 global_config => ' | 291 global_config => ' |
| 292 upstream discourse { | 292 upstream discourse { |
| 293 server localhost:3000; | 293 server localhost:3000; |
| 294 }', | 294 }', |
| 295 is_default => $is_default, | 295 is_default => $is_default, |
| 296 certificate => $certificate, | 296 certificate => $certificate, |
| 297 private_key => $private_key, | 297 private_key => $private_key, |
| 298 log => 'access_log_intraforum' | 298 log => 'access_log_intraforum' |
| 299 } | 299 } |
| 300 } | 300 } |
| OLD | NEW |