diff --git a/ct/maybefinance.sh b/ct/maybefinance.sh index 10ddfcd3..0f3a2440 100644 --- a/ct/maybefinance.sh +++ b/ct/maybefinance.sh @@ -36,7 +36,8 @@ function update_script() { msg_ok "Stopped $APP" msg_info "Creating Backup" - cp /opt/maybe/.env /opt/maybe.env + BACKUP_FILE="/opt/maybe_backup_$(date +%F).tar.gz" + $STD tar -czf "$BACKUP_FILE" /opt/maybe/{.env,storage/} &>/dev/null msg_ok "Backup Created" msg_info "Updating $APP to v${RELEASE}" @@ -45,8 +46,9 @@ function update_script() { unzip -q /tmp/v"$RELEASE".zip mv maybe-"$RELEASE" /opt/maybe cd /opt/maybe - r, ./config/credentials.yml.enc + rm ./config/credentials.yml.enc source ~/.profile + $STD tar -xf "$BACKUP_FILE" --directory=/ $STD ./bin/bundle install $STD ./bin/bundle exec bootsnap precompile --gemfile -j 0 $STD ./bin/bundle exec bootsnap precompile -j 0 app/ lib/ @@ -61,6 +63,7 @@ function update_script() { msg_info "Cleaning Up" rm /tmp/v"$RELEASE".zip + rm -f "$BACKUP_FILE" msg_ok "Cleanup Completed" echo "${RELEASE}" >/opt/maybe_version.txt diff --git a/install/maybefinance-install.sh b/install/maybefinance-install.sh index ad702645..7df9668b 100644 --- a/install/maybefinance-install.sh +++ b/install/maybefinance-install.sh @@ -57,7 +57,8 @@ unzip -q /tmp/v"$RELEASE".zip mv maybe-"$RELEASE" /opt/maybe cd /opt/maybe cp ./.env.example ./.env -sed -i -e "s/secret-value/\"$(openssl rand -hex 64)\"/" \ +sed -i -e '/SELF_/a RAILS_ENV=production' \ + -e "s/secret-value/\"$(openssl rand -hex 64)\"/" \ -e "/^SECRET_KEY/a RAILS_MASTER_KEY=\"$(openssl rand -hex 16)\"" \ -e "s/_USER=postgres/_USER=${DB_USER}/" \ -e "s/_PASSWORD=postgres/_PASSWORD=${DB_PASS}/" \ @@ -66,7 +67,7 @@ sed -i -e "s/secret-value/\"$(openssl rand -hex 64)\"/" \ ./.env sed -i -e '/_DB=/a\ \ -REDIS_URL=http://127.0.0.1:6379' \ +REDIS_URL=redis://localhost:6379/1' \ -e '/_SSL/a\ RAILS_FORCE_SSL=false\ RAILS_ASSUME_SSL=false' \ @@ -92,7 +93,7 @@ After=network.target redis.service postgresql.service Type=simple WorkingDirectory=/opt/maybe ExecStart=/root/.rbenv/shims/dotenv -f /opt/maybe/.env /opt/maybe/bin/rails s -Restart=unless-stopped +Restart=on-abnormal [Install] WantedBy=multi-user.target @@ -106,8 +107,7 @@ After=redis.service [Service] Type=simple WorkingDirectory=/opt/maybe -EnvironmentFile=/opt/maybe/.env -ExecStart=bundle exec sidekiq +ExecStart=/root/.rbenv/shims/dotenv -f /opt/maybe/.env /opt/maybe/bundle exec sidekiq Restart=unless-stopped [Install]