Merge master

db/schema.rb

@@ -561,7 +561,7 @@ ActiveRecord::Schema.define(version: 20200315183444) do
   add_index "predictions", ["match_id"], name: "index_predictions_on_match_id", using: :btree
   add_index "predictions", ["user_id"], name: "index_predictions_on_user_id", using: :btree
 
-  create_table "profiles", force: true do |t|
+  create_table "profiles", :options => 'ENGINE=MyISAM', :force => true do |t|
     t.integer  "user_id"
     t.string   "msn"
     t.string   "icq"
@@ -788,7 +788,7 @@ ActiveRecord::Schema.define(version: 20200315183444) do
     t.integer  "user_id",    null: false
     t.string   "comment"
     t.integer  "rank",       null: false
-    t.datetime "created_at"
+    t.datetime "created_at"mer
     t.datetime "updated_at"
   end
 

ext/mysql.conf.d/opt.cnf

@@ -29,3 +29,6 @@ innodb_flush_method             = O_DIRECT
 #innodb_additional_mem_pool_size = 20M
 innodb_file_per_table           = 1
 transaction-isolation           = READ-COMMITTED
+
+innodb_file_per_table=1
+innodb_file_format = Barracuda

script/entry.sh

@@ -1,7 +1,14 @@
 #!/bin/bash
 
 cd /var/www
-chown -R web:web /var/www
+
+source /var/www/.env
+
+if [ $RAILS_ENV = "production" ]; then
+  rm -rf /var/www/public/assets
+  mv /home/web/assets /var/www/public/
+  chown -R web:web /var/www
+fi
 
 su -c "bundle config github.https true; cd /var/www && bundle install --path /var/bundle --jobs 4" -s /bin/bash -l web
 su -c "cd /var/www && bundle exec puma -C config/puma.rb" -s /bin/bash -l web