aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--conf/app-mastodon.src4
-rw-r--r--conf/nginx.conf3
-rw-r--r--manifest.json2
-rw-r--r--scripts/install3
-rw-r--r--scripts/upgrade5
6 files changed, 10 insertions, 9 deletions
diff --git a/README.md b/README.md
index bd525b0..cce244f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Mastodon for YunoHost
-[![Latest Version](https://img.shields.io/badge/version-2.4.3-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
+[![Latest Version](https://img.shields.io/badge/version-2.4.5-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
[![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones)
[![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies)
[![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE)
diff --git a/conf/app-mastodon.src b/conf/app-mastodon.src
index 9ef161a..a63adff 100644
--- a/conf/app-mastodon.src
+++ b/conf/app-mastodon.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.3.tar.gz
-SOURCE_SUM=efdc680632386665d7b0ba988acd18113557ad165bcc158bfc2c273da76616ce
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.5.tar.gz
+SOURCE_SUM=9e8cf6a808c9c34b6b609e8acc86b91a02227580b61221d96a4b78560fcc592c
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index a183a31..87b517a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,6 +1,9 @@
# upload max size
client_max_body_size 100M;
+# Content Security Policy : security to avoid launching unsecure script
+add_header Content-Security-Policy "default-src 'none'; font-src 'self'; media-src 'self'; object-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; img-src 'self' blob: data:; connect-src 'self' wss://__DOMAIN__;";
+
# add to v1.4 assets
root __FINALPATH__/live/public;
diff --git a/manifest.json b/manifest.json
index 7496980..9e87449 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
"en": "Mastodon is a free, open-source social network.",
"fr": "Mastodon est un réseau social gratuit et open source."
},
- "version": "2.4.3",
+ "version": "2.4.5",
"url": "https://github.com/tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"maintainer": {
diff --git a/scripts/install b/scripts/install
index cd9a1ce..ffa152a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -134,9 +134,6 @@ ynh_setup_source "$final_path/live" "app-mastodon"
# NGINX CONFIGURATION
#=================================================
-# Create a dedicated nginx config
-ynh_replace_string "__PORT_WEB__" "$port_web" "../conf/nginx.conf"
-ynh_replace_string "__PORT_STREAM__" "$port_stream" "../conf/nginx.conf"
ynh_add_nginx_config
#=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 0429013..207858e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -116,10 +116,11 @@ ynh_secure_remove $final_path/live/config/initializers/timeout.rb
# NGINX CONFIGURATION
#=================================================
-ynh_replace_string "__PORT_WEB__" "$port_web" "../conf/nginx.conf"
-ynh_replace_string "__PORT_STREAM__" "$port_stream" "../conf/nginx.conf"
ynh_add_nginx_config
+#=================================================
+# UPGRADE MASTODON
+#=================================================
# Upgrade rbenv and ruby plugins
ynh_setup_source "$final_path/.rbenv" "app-rbenv"