diff options
| author | yalh76 <yalh@yahoo.com> | 2021-02-26 20:57:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 20:57:41 +0100 |
| commit | 27eafa9fd59c56ab915f03d080980bd1ab156590 (patch) | |
| tree | 4c6c68a73659155f6998b5120476b257cc057f4f /conf | |
| parent | a233ccc644d97aa89756fac9f0ce68c98d81d27c (diff) | |
| parent | d3172db5407767d08b94030a53b8d7c360499952 (diff) | |
| download | mastodon_ynh-27eafa9fd59c56ab915f03d080980bd1ab156590.tar.gz mastodon_ynh-27eafa9fd59c56ab915f03d080980bd1ab156590.tar.bz2 mastodon_ynh-27eafa9fd59c56ab915f03d080980bd1ab156590.zip | |
Merge pull request #258 from YunoHost-Apps/testing
Upgrade to 3.3.0~ynh1
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.src | 5 | ||||
| -rw-r--r-- | conf/mastodon-sidekiq.service | 2 | ||||
| -rw-r--r-- | conf/mastodon-web.service | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/conf/app.src b/conf/app.src index 5d0c0b4..6fb011a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,7 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.2.2.tar.gz -SOURCE_SUM=298396b1bd0065689c3d9225c8466c6651979834acb4eec511057ff1ba630781 +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.3.0.tar.gz +SOURCE_SUM=ffbaeaf18d9c440ac61c6c5c29fd6581b88c1d2843170f2cb5f0fcf8dcc0ecd6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index 7031e63..094813f 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -9,7 +9,7 @@ WorkingDirectory=__FINALPATH__/live Environment="RAILS_ENV=production" Environment="DB_POOL=25" Environment="MALLOC_ARENA_MAX=2" -ExecStart=__RBENV_ROOT__/shims/bundle exec sidekiq -c 25 +ExecStart=__RBENV_ROOT__/versions/__APP__/bin/bundle exec sidekiq -c 25 TimeoutSec=15 Restart=always StandardError=syslog diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service index 1f5b6be..e853df5 100644 --- a/conf/mastodon-web.service +++ b/conf/mastodon-web.service @@ -8,7 +8,7 @@ User=__APP__ WorkingDirectory=__FINALPATH__/live Environment="RAILS_ENV=production" Environment="PORT=__PORT_WEB__" -ExecStart=__RBENV_ROOT__/shims/bundle exec puma -C config/puma.rb +ExecStart=__RBENV_ROOT__/versions/__APP__/bin/bundle exec puma -C config/puma.rb ExecReload=/bin/kill -SIGUSR1 $MAINPID TimeoutSec=15 Restart=always |