Merge ~mthaddon/discourse-charm/+git/discourse-charm:system-packages into discourse-charm:master

[Tom Haddon]

Be explicit in layer.yaml that we're using venv, and include system packages, and update rake commands to use correct format.

Be explicit in layer.yaml that we're using venv, and include system packages, and update rake commands to use correct format.

fabba07... by Tom Haddon on 2019-09-10

Update bundle commands to use correct format

3605d59... by Tom Haddon on 2019-09-11

Run any DB migrations after creation

751b26f... by Tom Haddon on 2019-09-11

Use os.environ before bundle commands as documented in ruby layer usage

29a84d9... by Tom Haddon on 2019-09-11

Update config files given snap location of bundle binary, install unicorn gem, ensure we get full output from bundle exec commands

Unmerged commits

29a84d9... by Tom Haddon on 2019-09-11

Update config files given snap location of bundle binary, install unicorn gem, ensure we get full output from bundle exec commands

751b26f... by Tom Haddon on 2019-09-11

Use os.environ before bundle commands as documented in ruby layer usage

3605d59... by Tom Haddon on 2019-09-11

Run any DB migrations after creation

fabba07... by Tom Haddon on 2019-09-10

Update bundle commands to use correct format

afcb549... by Tom Haddon on 2019-09-10

Be explicit in layer.yaml that we're using venv, and include system packages

diff --git a/layer.yaml b/layer.yaml
index c3d5c9a..5e622b7 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -7,6 +7,8 @@ includes:
   - 'interface:nrpe-external-master'
 options:
   basic:
+    use_venv: true
+    include_system_packages: true
     packages:
       - imagemagick
       - optipng
diff --git a/reactive/discourse.py b/reactive/discourse.py
index a7edb9f..0ad3894 100644
--- a/reactive/discourse.py
+++ b/reactive/discourse.py
@@ -11,6 +11,7 @@ import pwd
 import grp
 import time
 import subprocess
+import sh
 
 
 # Utility function to read the discourse.conf file, which is just key=value
@@ -105,15 +106,14 @@ def install_discourse():
     if hookenv.config('admin-users'):
         config['developer_emails'] = hookenv.config('admin-users')
     write_config(config)
-    # Bionic seems to require that you manually install rake globally before
-    # running bundle install, as far as I can tell this shouldn't hurt anything
-    # in the xenial version, it's just not necessary per se there.
-    rake_install_cmd = ['gem', 'install', 'rake']
+    # Install required gems
+    rake_install_cmd = ['gem', 'install', 'rake', 'concurrent-ruby', 'unicorn']
     proxy = hookenv.config('http-proxy')
     if proxy:
         rake_install_cmd.extend(['-p', proxy])
     subprocess.call(rake_install_cmd)
     # Bundle command is from the ruby layer, it'll install our gem dependencies
+    os.environ['RAILS_ENV'] = 'production'
     bundle('install')
     hookenv.status_set('blocked', 'Discourse installed, waiting on database.')
     set_state('discourse.installed')
@@ -138,9 +138,26 @@ def db_available(pgsql):
 @when('discourse.database.created')
 def prepare_codebase(pgsql):
     # Create all the Discourse specific DB schema
-    bundle('exec rake db:migrate RAILS_ENV=production')
-    # Compile CSS/JS?  I'm not sure what this does but it's necessary.
-    bundle('exec rake assets:precompile RAILS_ENV=production')
+    os.environ['RAILS_ENV'] = 'production'
+    try:
+        for line in bundle('exec', 'rake', 'db:create', _bg_exc=False, _iter=True):
+            print(line)
+    except sh.ErrorReturnCode as error:
+        print("Exception occured: \n{}".format(error))
+    # Run any necessary migrations
+    try:
+        for line in bundle('exec', 'rake', 'db:migrate', _bg_exc=False, _iter=True):
+            print(line)
+    except sh.ErrorReturnCode as error:
+        print("Exception occured: \n{}".format(error))
+
+    # Compile CSS/JS
+    try:
+        for line in bundle('exec', 'rake', 'assets:precompile', _bg_exc=False, _iter=True):
+            print(line)
+    except sh.ErrorReturnCode as error:
+        print("Exception occured: \n{}".format(error))
+
     if hookenv.config('plugins'):
         fetch_plugins()
     # The ruby layer doesn't have a concept of ownership, so after the rakes
diff --git a/templates/sidekiq.service b/templates/sidekiq.service
index d46528e..2ea58ae 100644
--- a/templates/sidekiq.service
+++ b/templates/sidekiq.service
@@ -28,7 +28,7 @@ WorkingDirectory=/srv/discourse/current/
 # If you use rbenv:
 # ExecStart=/bin/bash -lc 'bundle exec sidekiq -e production'
 # If you use the system's ruby:
-ExecStart=/usr/bin/bundle exec sidekiq -e production -q critical -q default -q low
+ExecStart=/snap/bin/bundle exec sidekiq -e production -q critical -q default -q low
 User=www-data
 Group=www-data
 UMask=0002
diff --git a/templates/unicorn.service b/templates/unicorn.service
index 2649472..dafa503 100644
--- a/templates/unicorn.service
+++ b/templates/unicorn.service
@@ -13,7 +13,7 @@ Environment=RAILS_ENV=production
 SyslogIdentifier=unicorn
 PIDFile=/srv/discourse/current/tmp/pids/unicorn.pid
 
-ExecStart=/usr/bin/bundle exec "unicorn -D -c /srv/discourse/current/config/unicorn.conf.rb -E production"
+ExecStart=/snap/bin/bundle exec unicorn -D -c /srv/discourse/current/config/unicorn.conf.rb -E production
 
 [Install]
 WantedBy=multi-user.target