From 3a02566f0a1ad50c3949f715a8bd7660c409d483 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Mon, 22 May 2017 00:42:09 +0200
Subject: [PATCH] Fix upgrade 1.4 (#33)

* [fix] Upgrade nodejs + conf protobuf

Fix mastodon 1.4 upgrade
---
 conf/nginx.conf |  9 +++++++++
 scripts/upgrade | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 0d48dc5..85f883c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,6 +1,9 @@
 # upload max size
 client_max_body_size 100M;
 
+# add to v1.4 assets
+root /opt/mastodon/live/public;
+
 location / {
 
 	if ($scheme = http) {
@@ -13,6 +16,12 @@ location / {
 	include conf.d/yunohost_panel.conf.inc;
 }
 
+# add to v1.4 assets
+location ~ ^/(assets|system/media_attachments/files|system/accounts/avatars) {
+    add_header Cache-Control "public, max-age=31536000, immutable";
+    try_files $uri @proxy;
+  }
+
 location @proxy {
 	proxy_set_header Host $host;
 	proxy_set_header X-Real-IP $remote_addr;
diff --git a/scripts/upgrade b/scripts/upgrade
index 4038fa7..2a9b0fe 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -40,7 +40,7 @@ sudo systemctl stop mastodon-*.service
 # Change owner of live folder
 sudo chown -R $app: $final_path/live
 
-# upgrade Node.js v4 to v6 
+# upgrade Node.js v4 to v6
 node_version=$(nodejs --version)
 if [[ $node_version =~ ^v4.*$  ]]; then
 	pushd /opt
@@ -65,6 +65,17 @@ pushd ~/live
 git checkout $version
 SWITCHCOMMANDS
 
+# upgrade Node.js v4 to v6
+node_version=$(nodejs --version)
+if [[ $node_version =~ ^v4.*$  ]]; then
+	pushd /opt
+	curl -sL https://deb.nodesource.com/setup_6.x | sudo bash -
+	sudo apt-get -y install nodejs
+fi
+
+# add additional package for release 1.4
+ynh_package_install pkg-config libprotobuf-dev protobuf-compiler
+
 # Apply Mastodon upgrade
 sudo su - $app <<COMMANDS
 pushd ~/live