more useful motd message, added shortcut for various tools

[discourse_docker.git] / templates / web.template.yml

diff --git a/templates/web.template.yml b/templates/web.template.yml
index 1784206bb56cdf2a42eba0bc466a661978bc3383..ee53dde684a77da7d413b2f5ed0e693a0ae0b115 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -24,6 +24,7 @@ run:
      chmod: "+x"
      contents: |
         #!/bin/bash
+        env > ~/boot_env
         conf=/var/www/discourse/config/discourse.conf
         sudo -u discourse echo > $conf
 
@@ -76,12 +77,12 @@ run:
         - git clean -f
         - git pull
         - git checkout $version
-        - touch tmp/.gitkeep
         - mkdir -p tmp/pids
         - mkdir -p tmp/sockets
         - mkdir -p /shared/log/rails
         - mkdir -p /shared/uploads
         - mkdir -p /shared/backups
+        - touch tmp/.gitkeep
         - rm -r log
         - ln -s /shared/log/rails $home/log
         - ln -s /shared/uploads $home/public/uploads
@@ -89,7 +90,7 @@ run:
         - chown -R discourse:www-data /shared/log/rails
         - chown -R discourse:www-data /shared/uploads
         - chown -R discourse:www-data /shared/backups
-        
+
   - exec:
       cmd:
         - "cp $home/config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf"
@@ -119,8 +120,43 @@ run:
   - exec:
       cd: $home
       cmd:
+        # ensure we are on latest bundler
+        - gem update bundler
+        - mkdir -p /shared/vendor_bundle
+        - cp -fr /shared/vendor_bundle/* vendor/bundle || echo "can not copy"
         - chown -R discourse $home
         - sudo -E -u discourse bundle install --deployment --verbose --without test --without development
+        - cp -fr vendor/bundle/* /shared/vendor_bundle
         - sudo -E -u discourse bundle exec rake db:migrate
         - sudo -E -u discourse bundle exec rake assets:precompile
 
+  - file:
+     path: /usr/local/bin/discourse
+     chmod: +x
+     contents: |
+       #!/bin/bash
+       (cd /var/www/discourse && RAILS_ENV=production sudo -E -u discourse bundle exec script/discourse "$@")
+
+  - file:
+     path: /usr/local/bin/rails
+     chmod: +x
+     contents: |
+       #!/bin/bash
+       (cd /var/www/discourse && RAILS_ENV=production sudo -E -u discourse bundle exec script/rails "$@")
+
+  - file:
+     path: /usr/local/bin/rake
+     chmod: +x
+     contents: |
+       #!/bin/bash
+       (cd /var/www/discourse && RAILS_ENV=production sudo -E -u discourse bundle exec bin/rake "$@")
+
+  - file:
+     path: /etc/update-motd.d/10-web
+     chmod: +x
+     contents: |
+       #!/bin/bash
+       echo
+       echo Use: rails, rake or discourse to execute commands in production
+       echo
+