From 881197fc583749e341311e28c024c50e21cb2031 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 7 Dec 2021 22:40:13 +0100
Subject: fix linter

---
 conf/nginx.conf | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'conf')

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;
 
-- 
cgit v1.2.3-70-g09d2


From 06731a7ae9633399c45eaaa6085ed242603fdbd8 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 7 Dec 2021 22:46:49 +0100
Subject: 3.4.4

---
 conf/app.src       | 5 ++---
 manifest.json      | 6 +++---
 scripts/_common.sh | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'conf')

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/manifest.json b/manifest.json
index 662f34a..c1defdf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,10 @@
     "id": "mastodon",
     "packaging_format": 1,
     "description": {
-        "en": "Libre and federated social network.",
-        "fr": "Réseau social libre et fédéré."
+        "en": "Libre and federated social network",
+        "fr": "Réseau social libre et fédéré"
     },
-    "version": "3.4.1~ynh4",
+    "version": "3.4.4~ynh1",
     "url": "https://github.com/tootsuite/mastodon",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index b6f4796..4b87d9b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core g++ libprotobuf-dev protobuf-compiler pkg-config gcc autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3|libgdbm6 libgdbm-dev redis-server redis-tools postgresql postgresql-contrib libidn11-dev libicu-dev libjemalloc-dev curl apt-transport-https"
+pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core g++ libprotobuf-dev protobuf-compiler pkg-config gcc autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3|libgdbm6 libgdbm-dev postgresql postgresql-contrib libidn11-dev libicu-dev libjemalloc-dev curl apt-transport-https"
 
 MEMORY_NEEDED="2560"
 
-- 
cgit v1.2.3-70-g09d2


From 482585648ef59fbe16e289034fcf1602f0587be5 Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Thu, 6 Jan 2022 20:05:16 +0100
Subject: Fix cron tasks

Fix #278
---
 conf/cron | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'conf')

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
-- 
cgit v1.2.3-70-g09d2