diff options
| author | yalh76 <yalh@yahoo.com> | 2019-05-12 20:32:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-12 20:32:33 +0200 |
| commit | c857d70f73587852cacc608a4e140b5b6b2b9e87 (patch) | |
| tree | 0cf3ea06df3f1b5f6206d51518f805a481417117 /conf | |
| parent | 386c48a3389d0d817b87bccf43f312f75782646a (diff) | |
| parent | 0e6fcf1700e12399fea0bf3ba0c91a71f0bec9cc (diff) | |
| download | mastodon_ynh-c857d70f73587852cacc608a4e140b5b6b2b9e87.tar.gz mastodon_ynh-c857d70f73587852cacc608a4e140b5b6b2b9e87.tar.bz2 mastodon_ynh-c857d70f73587852cacc608a4e140b5b6b2b9e87.zip | |
Merge branch 'testing' into example_ynh
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/.env.production.sample | 3 | ||||
| -rw-r--r-- | conf/app.src | 4 | ||||
| -rw-r--r-- | conf/cron | 2 | ||||
| -rw-r--r-- | conf/mastodon-sidekiq.service | 2 | ||||
| -rw-r--r-- | conf/mastodon-web.service | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/conf/.env.production.sample b/conf/.env.production.sample index c2324a8..203b74b 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -10,6 +10,7 @@ DB_NAME=__DB_NAME__ DB_PASS=__DB_PWD__ DB_PORT=5432 # Optional ElasticSearch configuration +# You may also set ES_PREFIX to share the same cluster between multiple Mastodon servers (falls back to REDIS_NAMESPACE if not set) # ES_ENABLED=true # ES_HOST=es # ES_PORT=9200 @@ -222,7 +223,7 @@ STREAMING_CLUSTER_NUM=1 # SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241" # SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42" # SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4" -# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1" +# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1" # SAML_ATTRIBUTES_STATEMENTS_VERIFIED= # SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL= diff --git a/conf/app.src b/conf/app.src index 9d7227b..f3c9cdd 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.7.4.tar.gz -SOURCE_SUM=0e542c57228d482a068b05f639d8fe53dd9d413f7e7ce93cd1a088bd4d8d8366 +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.8.2.tar.gz +SOURCE_SUM=b6f4aec3f9f6ff053b548c7eb3921347904eb366636a5e417fef97f6adb3c337 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true @@ -1,2 +1,2 @@ RAILS_ENV=production -@daily cd __FINAL__PATH__/live && /opt/rbenv/versions/2.6.0/bin/bundle exec rake __USER__:media:remove_remote +@daily cd __FINAL__PATH__/live && /opt/rbenv/versions/2.6.1/bin/bundle exec rake __USER__:media:remove_remote diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index 920fcf4..cd7db81 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -9,7 +9,7 @@ Environment="RAILS_ENV=production" Environment="DB_POOL=25" Environment="MALLOC_ARENA_MAX=2" - ExecStart=/opt/rbenv/versions/2.6.0/bin/bundle exec sidekiq -c 25 + ExecStart=/opt/rbenv/versions/2.6.1/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 c95ba7f..d2f5fdd 100644 --- a/conf/mastodon-web.service +++ b/conf/mastodon-web.service @@ -8,7 +8,7 @@ WorkingDirectory=__FINALPATH__/live Environment="RAILS_ENV=production" Environment="PORT=__PORT_WEB__" - ExecStart=/opt/rbenv/versions/2.6.0/bin/bundle exec puma -C config/puma.rb + ExecStart=/opt/rbenv/versions/2.6.1/bin/bundle exec puma -C config/puma.rb ExecReload=/bin/kill -SIGUSR1 $MAINPID TimeoutSec=15 Restart=always |