Merge pull request #89 from YunoHost-Apps/testing

Upgrade to 1.1.0

README.md

@@ -13,7 +13,7 @@ Mobilizon aims to solve existing platform's problems to organize events in a dec
 
 Mobilizon is a tool that helps you find, create and organise events. You can also create a page for your group where the members will be able to organise together.
 
-**Shipped version:** 1.0.7
+**Shipped version:** 1.1.0
 
 ## Important points to read before installing
 

check_process

@@ -24,6 +24,8 @@
 		# upgrade=1	from_commit=8413ab8bd3aca3e2f6c431153dd9dfab37860956
 		# 1.0.6-2021-02-23~ynh1
 		upgrade=1	from_commit=8d20652e67015a535b2063edc54379604a7d932d
+		# 1.0.7~ynh1
+		upgrade=1	from_commit=cba843be0d7e00d7d7290f0d0da95807711a96d4
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -42,3 +44,5 @@ Notification=all
 		name=1.0.3~ynh1
 	; commit=8d20652e67015a535b2063edc54379604a7d932d
 		name=1.0.6-2021-02-23~ynh1
+	; commit=cba843be0d7e00d7d7290f0d0da95807711a96d4
+		name=1.0.7~ynh1

conf/app.src

@@ -1,7 +1,7 @@
-SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.0.7/mobilizon-1.0.7.tar.gz
-SOURCE_SUM=61b571682aad5e4e41b8dafce76531d97c1a8d4f2429c14c1b94c59bc37b4d47
+SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.1.0/mobilizon-1.1.0.tar.gz
+SOURCE_SUM=b1cc0e8c2588f67aedd6c43200656132535ac6cf360dadd0a02bac6fc19dbe02
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=mobilizon-1.0.7.tar.gz
+SOURCE_FILENAME=mobilizon-1.1.0.tar.gz
 SOURCE_EXTRACT=true

conf/prod.secret.exs

@@ -1,31 +0,0 @@
-# Mobilizon instance configuration
-
-import Config
-
-config :mobilizon, Mobilizon.Web.Endpoint,
-   url: [host: "__DOMAIN__"],
-   http: [port: __PORT__],
-   secret_key_base: "__SECRET__"
-
-config :mobilizon, Mobilizon.Web.Auth.Guardian,
-  secret_key: ""
-
-config :mobilizon, :instance,
-  name: "Mobilizon",
-  description: "Change this to a proper description of your instance",
-  hostname: "__DOMAIN__",
-  registrations_open: false,
-  demo: false,
-  allow_relay: true,
-  federating: true,
-  email_from: "__APP__@__DOMAIN__",
-  email_reply_to: "__APP__@__DOMAIN__"
-
-config :mobilizon, Mobilizon.Storage.Repo,
-  adapter: Ecto.Adapters.Postgres,
-  username: "__DB_USER__",
-  password: "__DB_PWD__",
-  database: "__DB_NAME__",
-  hostname: "localhost",
-  port: "5432",
-  pool_size: 10

manifest.json

@@ -6,7 +6,7 @@
         "en": "A decentralized and federated platform to organize events",
         "fr": "Une plateforme décentralisée et fédérée pour organiser des événements"
     },
-    "version": "1.0.7~ynh1",
+    "version": "1.1.0~ynh1",
     "url": "https://joinmobilizon.org/",
     "license": "AGPL-3.0-or-later",
     "maintainer": {

scripts/upgrade

@@ -125,15 +125,21 @@ then
 	# Backup the config file in the temp dir
 	cp -a "$final_path/$app/config/prod.secret.exs" "$tmpdir/prod.secret.exs"
 
+	# Backup upload dir
+	rsync -a "$final_path/$app/uploads" "$tmpdir/."
+	
 	# Remove the app directory securely
 	ynh_secure_remove --file="$final_path/$app"
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path/$app"
 	
-	#Copy the admin saved settings from tmp directory to final path
+	# Restore the config file
 	cp -a "$tmpdir/prod.secret.exs" "$final_path/$app/config/prod.secret.exs"
 
+	# Restore upload dir
+	rsync -a "$tmpdir/uploads" "$final_path/$app/."
+	
 	# Remove the tmp directory securely
 	ynh_secure_remove --file="$tmpdir"
 fi