diff options
| author | nemsia <nemsia@nemsia.org> | 2018-06-12 15:33:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 15:33:34 +0200 |
| commit | ba3ce5d001e05f6ad530b85ee24279c326705775 (patch) | |
| tree | d2095c3a6b6a9b73808477271553d047291e6a90 | |
| parent | 64d3147a7b68f9e94f231b9a8aa6e9199b2824aa (diff) | |
| download | mastodon_ynh-ba3ce5d001e05f6ad530b85ee24279c326705775.tar.gz mastodon_ynh-ba3ce5d001e05f6ad530b85ee24279c326705775.tar.bz2 mastodon_ynh-ba3ce5d001e05f6ad530b85ee24279c326705775.zip | |
Fix migrated stretch upgrade (#88)
* upgrade-2.3.3
upgrade-2.3.3
git fetch with all tags forced
* Upgrade 2.4.0 (#21)
* Upgrade 2.4 (#79)
* Upgrade rb to 2.5.1
* Update upgrade
* Fix 2.3.3
* Add trace on assets:precompile
* Yarn install and precompile
Update 2.4 need root to yarn install and precompile,
Temporary bad fix.
* Update upgrade
* Fix migrate
* Update README.md
* Update manifest.json
* Upgrade yarn to 1.7.0
* Restart postgresql on upgrade
* Ready to Debian Stretch (#22)
* Ready to Debian Stretch
* rb 2.5.1 on install
* Yarn install on root
* rails precompile fix
* Fix backup on stretch
* clean
* fix backup stretch
* Change systemd mastodon service restart
* Change systemd script for stretch
* Ready to mastodon 2.4.1
* Fix migrated stretch (#23)
* Force bundle re-install
* Add check debian on upgrade and clean check
| -rw-r--r-- | scripts/backup | 3 | ||||
| -rw-r--r-- | scripts/install | 3 | ||||
| -rw-r--r-- | scripts/restore | 3 | ||||
| -rw-r--r-- | scripts/upgrade | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/scripts/backup b/scripts/backup index b7ff222..8040747 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,8 +32,7 @@ ynh_backup "/etc/cron.d/${app}" "cron.conf" ynh_backup "/etc/systemd/system/mastodon-web.service" "systemd_web.service" ynh_backup "/etc/systemd/system/mastodon-sidekiq.service" "systemd_sidekiq.service" ynh_backup "/etc/systemd/system/mastodon-streaming.service" "systemd_streaming.service" -debian_version=$(lsb_release -c -s) -if [[ $debian_version = jessie ]]; then +if [ "$(lsb_release --codename --short)" == "jessie" ]; then ynh_backup "/etc/apt/sources.list.d/backports.list" "apt_backports.list" fi ynh_backup "/etc/apt/sources.list.d/yarn.list" "apt_yarn.list" diff --git a/scripts/install b/scripts/install index d92e0ed..03f91bd 100644 --- a/scripts/install +++ b/scripts/install @@ -64,8 +64,7 @@ sudo curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - sudo cp ../conf/yarn.list /etc/apt/sources.list.d/ # Install source.list debian jessie package backports -debian_version=$(lsb_release -c -s) -if [[ $debian_version = jessie ]]; then +if [ "$(lsb_release --codename --short)" == "jessie" ]; then sudo cp ../conf/backports.list /etc/apt/sources.list.d/ ynh_package_update sudo apt-get -t jessie-backports -y install ffmpeg diff --git a/scripts/restore b/scripts/restore index c6031de..1eb67e8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -90,8 +90,7 @@ sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,Home sudo cp ./apt_yarn.list /etc/apt/sources.list.d/yarn.list # Install source.list debian jessie package backports - debian_version=$(lsb_release -c -s) - if [[ $debian_version = jessie ]]; then + if [ "$(lsb_release --codename --short)" == "jessie" ]; then sudo cp ./apt_backports.list /etc/apt/sources.list.d/backports.list ynh_package_update sudo apt-get -t jessie-backports -y install ffmpeg diff --git a/scripts/upgrade b/scripts/upgrade index ca0df71..63c3b75 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,7 +83,11 @@ sudo ln -s $final_path/.rbenv/versions/2.5.1/bin/ruby /usr/bin/ruby || true sudo su - $app <<MCOMMANDS pushd ~/live $final_path/.rbenv/versions/2.5.1/bin/gem install bundler -$final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --without development test +if [ "$(lsb_release --codename --short)" == "jessie" ]; then + $final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --without development test +else + $final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --force --without development test +fi MCOMMANDS # Install package with yarn and restart postgresql |