aboutsummaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2022-01-07 19:41:59 +0100
committerGitHub <noreply@github.com>2022-01-07 19:41:59 +0100
commitfa8a9d4eed460fa73926e7874313091dffb7b9fc (patch)
tree155293eb2bf6b881ab4bae9490440bd2125cdfec /conf
parentadec07db890dec787416e1b7c4493d24391d3500 (diff)
parent1476f17251ea0b339390cfa5210e258342ea5a4a (diff)
downloadmastodon_ynh-fa8a9d4eed460fa73926e7874313091dffb7b9fc.tar.gz
mastodon_ynh-fa8a9d4eed460fa73926e7874313091dffb7b9fc.tar.bz2
mastodon_ynh-fa8a9d4eed460fa73926e7874313091dffb7b9fc.zip
Merge pull request #290 from YunoHost-Apps/testing
Upgrade to 3.4.4
Diffstat (limited to 'conf')
-rw-r--r--conf/app.src5
-rw-r--r--conf/cron10
-rw-r--r--conf/nginx.conf5
3 files changed, 7 insertions, 13 deletions
diff --git a/conf/app.src b/conf/app.src
index dcbcb48..1c9fc19 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,6 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v3.4.1.tar.gz
-SOURCE_SUM=9e449805ea78afa62fee8ab31a427dee57b50cdb391335d4986d10e611103fbd
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v3.4.4.tar.gz
+SOURCE_SUM=567e57cc9d35306cbd708a33bc0bf1adf7981f3706ca4eced0d0c2b4f980034d
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
SOURCE_EXTRACT=true
diff --git a/conf/cron b/conf/cron
index 776808b..710e7f0 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,5 +1,5 @@
-@daily cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove-orphans
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl accounts cull
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl statuses remove
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl preview_cards remove
+@daily cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl media remove
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl media remove-orphans
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl accounts cull
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl statuses remove
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl preview_cards remove
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 866fcc7..19c2c01 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -6,11 +6,6 @@ root __FINALPATH__/live/public;
location / {
- # Force usage of https
- if ($scheme = http) {
- rewrite ^ https://$server_name$request_uri? permanent;
- }
-
proxy_set_header Accept-Encoding "";
try_files $uri @proxy;