Issue 212 - Update Discourse

modules/discourse/manifests/init.pp

Index: modules/discourse/manifests/init.pp
===================================================================
--- a/modules/discourse/manifests/init.pp
+++ b/modules/discourse/manifests/init.pp
@@ -1,69 +1,68 @@
-class discourse inherits private::discourse {
+class discourse(
+    $domain,
+    $is_default = false) inherits private::discourse {

[Felix Dahlke, 2014/03/27 15:49:11]

Nit: We usually break before ")" in argument lists, I think.

[Wladimir Palant, 2014/03/27 20:28:24]

From what I can tell, the only other occasions are nginx (there we have a line
break) and trac (there we don't have it). But I guess having a line break would
be consistent with the usual Puppet style, done. We might want to change it in
the Trac module as well when we touch it.

   include postgresql::server
 
   postgresql::database {'discourse':}
 
   postgresql::role {'discourse':
     password_hash => $database_password,
     db => 'discourse',
     login => true,
     superuser => true,
     require => Postgresql::Database['discourse']
   }
 
-  package {['postgresql-contrib', 'redis-server', 'ruby1.9.1']:
+  package {['postgresql-contrib', 'redis-server', 'ruby1.9.1', 'libjemalloc1', 'imagemagick']:
     ensure => present
   }
 
   Exec {path => '/bin:/usr/bin:/usr/sbin:/usr/local/bin'}
 
   exec {'update-alternatives --set ruby "/usr/bin/ruby1.9.1"':
     unless => 'test $(readlink "/etc/alternatives/ruby") == "/usr/bin/ruby1.9.1"',
     require => Package['ruby1.9.1']
   }
 
   exec {'update-alternatives --set gem "/usr/bin/gem1.9.1"':
     unless => 'test $(readlink "/etc/alternatives/gem") == "/usr/bin/gem1.9.1"',
     require => Package['ruby1.9.1'],
-    before => Package['bundler']
+    before => Exec['/usr/bin/gem update --system 1.8.25']
+  }
+
+  exec {'/usr/bin/gem update --system 1.8.25':
+    unless => 'test $(gem -v) == "1.8.25"',
+    environment => 'REALLY_GEM_UPDATE_SYSTEM=1',
+    before => Package['bundler'],
   }
 
   package {'bundler':
     ensure => present,
     provider => gem
   }
 
   $gem_dependencies = ['git', 'build-essential', 'ruby1.9.1-dev', 'libxml2-dev',
                        'libxslt-dev', 'libpq-dev']
   package {$gem_dependencies: ensure => present}
 
-  file {'/opt/discourse':
+  file {['/opt/discourse', '/opt/discourse/tmp', '/opt/discourse/tmp/pids']:
     ensure => directory,
     mode => 755,
     owner => discourse,
     group => www-data
   }
 
-  file {'/opt/discourse/config/database.yml':
+  file {'/opt/discourse/config/discourse.conf':
     mode => 600,
     owner => discourse,
     group => www-data,
-    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'],
+    content => template('discourse/discourse.conf.erb'),
+    notify => Service['discourse'],
     require => Exec['fetch-discourse']
   }
 
   file {'/usr/local/bin/init-discourse':
     mode => 0755,
     owner => root,
     group => root,
     source => 'puppet:///modules/discourse/init-discourse'
@@ -88,32 +87,32 @@ class discourse inherits private::discou
   }
 
   exec {'fetch-discourse':
     command => "hg clone https://hg.adblockplus.org/discourse /opt/discourse",
     path => ["/usr/bin/", "/bin/"],
     user => discourse,
     group => www-data,
     require => [Package['mercurial'], File['/opt/discourse']],
+    notify => Exec['/usr/local/bin/init-discourse'],
     onlyif => "test ! -d /opt/discourse/.hg"
   }
 
   exec {'/usr/local/bin/init-discourse':
     subscribe => File['/usr/local/bin/init-discourse'],
     refreshonly => true,
-    environment => ["DISCOURSE_SECRET=${secret}", "AIRBRAKE_KEY=${airbrake_key}"],
+    environment => ["AIRBRAKE_KEY=${airbrake_key}"],
     user => discourse,
     group => www-data,
     timeout => 0,
     logoutput => true,
     require => [Package['bundler', 'postgresql-contrib', $gem_dependencies],
                 User['discourse'], File['/etc/sudoers.d/discourse'],
                 Exec['fetch-discourse'],
-                File['/opt/discourse/config/database.yml'],
-                File['/opt/discourse/config/redis.yml'],
+                File['/opt/discourse/config/discourse.conf'],
                 Postgresql::Role['discourse']]
   }
 
   Discourse::Sitesetting <| |> {
     require => Exec['/usr/local/bin/init-discourse']
   }
 
   discourse::sitesetting {'title':
@@ -129,16 +128,22 @@ class discourse inherits private::discou
   }
 
   discourse::sitesetting {'contact_email':
     ensure => present,
     type => 1,
     value => 'admins@adblockplus.org'
   }
 
+  discourse::sitesetting {'site_contact_username':
+    ensure => present,
+    type => 1,
+    value => 'system'
+  }
+
   discourse::sitesetting {'must_approve_users':
     ensure => present,
     type => 5,
     value => 'f'
   }
 
   discourse::sitesetting {'login_required':
     ensure => present,
@@ -270,40 +275,33 @@ class discourse inherits private::discou
 
   discourse::postactiontype {'spam':
     ensure => present,
     id => 7,
     position => 6,
     is_flag => true
   }
 
-  discourse::admin {$admins:
-    ensure => present,
+  Discourse::Customservice <| |> {
+    user => 'discourse',
+    workdir => '/opt/discourse',
+    env => ['RAILS_ENV=production', 'RUBY_GC_MALLOC_LIMIT=90000000',
+      'UNICORN_WORKERS=2', 'LD_PRELOAD=/usr/lib/libjemalloc.so.1'],
     require => Exec['/usr/local/bin/init-discourse']
   }
 
-  Discourse::Customservice <| |> {
-    user => 'discourse',
-    workdir => '/opt/discourse',
-    env => ['GEM_HOME=~discourse/.gems', 'RAILS_ENV=production', 'RUBY_GC_MALLOC_LIMIT=90000000'],
-    require => Exec['/usr/local/bin/init-discourse']
-  }
-
-  discourse::customservice {'discourse-thin':
-    command => 'bundle exec thin -S /tmp/discourse-thin.sock start'
+  discourse::customservice {'discourse':
+    command => 'bundle exec config/unicorn_launcher -c config/unicorn.conf.rb',
+    require => File['/opt/discourse/tmp/pids'],
   }
 
   discourse::customservice {'sidekiq':
     command => 'bundle exec sidekiq'
   }
 
-  discourse::customservice {'clockwork':
-    command => 'bundle exec clockwork config/clock.rb'
-  }
-
   class {'nginx':
     worker_processes => 1,
     worker_connections => 500
   }
 
   file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key':
     ensure => file,
     notify => Service['nginx'],
@@ -311,24 +309,24 @@ class discourse inherits private::discou
     require => Package['nginx'],
     source => 'puppet:///modules/private/adblockplus.org_sslcert.key'
   }
 
   file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem':
     ensure => file,
     mode => 0400,
     notify => Service['nginx'],
-    before => Nginx::Hostconfig['intraforum.adblockplus.org'],
+    before => Nginx::Hostconfig[$domain],
     require => Package['nginx'],
     source => 'puppet:///modules/private/adblockplus.org_sslcert.pem'
   }
 
-  nginx::hostconfig{'intraforum.adblockplus.org':
-    source => 'puppet:///modules/discourse/intraforum.adblockplus.org',
+  nginx::hostconfig{$domain:
+    content => template('discourse/site.erb'),
     enabled => true
   }
 
-  file {'/etc/logrotate.d/nginx_intraforum.adblockplus.org':
+  file {"/etc/logrotate.d/nginx_$domain":
     ensure => file,
-    require => Nginx::Hostconfig['intraforum.adblockplus.org'],
+    require => Nginx::Hostconfig[$domain],
     source => 'puppet:///modules/discourse/logrotate'
   }
 }