From 91ddc5f6f22530c1ea274a964975747153801787 Mon Sep 17 00:00:00 2001 From: anmol26s Date: Mon, 3 Sep 2018 16:22:31 +0530 Subject: [PATCH 1/2] Updated to version 2.5.0 --- README.md | 2 +- conf/app-mastodon.src | 4 ++-- conf/nginx.conf | 3 +++ manifest.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cce244f..d81ad4a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Mastodon for YunoHost -[![Latest Version](https://img.shields.io/badge/version-2.4.5-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases) +[![Latest Version](https://img.shields.io/badge/version-2.5.0-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 a63adff..32aa8c6 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.5.tar.gz -SOURCE_SUM=9e8cf6a808c9c34b6b609e8acc86b91a02227580b61221d96a4b78560fcc592c +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.5.0.tar.gz +SOURCE_SUM=0b36693058647ab50fff7f1c0c678f0f2b2997908c542c488386e8e16beced74 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index a183a31..156d56d 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 9e87449..248cf01 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.5", + "version": "2.5.0", "url": "https://github.com/tootsuite/mastodon", "license": "AGPL-3.0-or-later", "maintainer": { From c0f6ab9d6b2974e21cdc7e1256b33866013ee54b Mon Sep 17 00:00:00 2001 From: anmol26s Date: Mon, 3 Sep 2018 21:12:35 +0530 Subject: [PATCH 2/2] Remove nginx replace string duplicate in install --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 8c18517..cd9a1ce 100644 --- a/scripts/install +++ b/scripts/install @@ -274,8 +274,6 @@ ynh_app_setting_set "$app" unprotected_uris "/" # RELOAD NGINX #================================================= -ynh_replace_string "__PORT_WEB__" "$port_web" "../conf/nginx.conf" -ynh_replace_string "__PORT_STREAM__" "$port_stream" "../conf/nginx.conf" # Reload Nginx systemctl reload nginx