Merge branch 'testing' into master

README.md

@@ -1,16 +1,20 @@
-# Friendica social network for YunoHost
-
+# Friendica for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg)
 
 [![Install Friendica with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=friendica)
 
+
 > *This package allow you to install Friendica quickly and simply on a YunoHost server.
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to learn how to install and enjoy it.*
 
+## Overview
+Friendica is a software to create a distributed social network. It is part of the federation of servers that are running with Friendica, Diaspora and Hubzilla which are compatible to each other.
+
 
 **Version:** 2021.01
 
+
 Current snapshot in *sources*:
 
 * https://github.com/friendica/friendica: 2021.01
@@ -32,7 +36,6 @@ Friendica connects you effortlessly to a federated communications network of sev
 - [ ] Add php.log in the root folder for debugging php, with logrotate applied on it (can be accesssed by **admin->logs** and entering the **php.log**).
 - [ ] Fail2ban
 
-
 ## Installation
 
 ### Register a new domain and add it to YunoHost
@@ -62,10 +65,18 @@ Use the YunoHost admin panel to install Friendica by entering the GitHub repo ad
 * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/friendica%20%28Official%29.svg)](https://ci-stretch.nohost.me/ci/apps/friendica/)
 
 
-Developers info
-----------------
 
-**Only if you want to use a testing branch for coding, instead of merging directly into master.**
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/friendica_ynh/issues
+ * App website: http://friendi.ca/
+ * Upstream app repository: https://github.com/friendica/friendica
+ * YunoHost website: https://yunohost.org/
+
+---
+
+## Developers info
+
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.

conf/nginx.conf

@@ -28,7 +28,9 @@
 # You have PHP FastCGI Process Manager (php5-fpm) running on localhost
 # You have Friendica installed in /var/www/friendica
 ##
-location __PATH__  {
+
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/  {
     alias __FINALPATH__/;
 
     if ($scheme = http) {

scripts/upgrade

@@ -83,11 +83,11 @@ fi
 
 # Remove files for upgrade compatibilty from previous versions of Friendica
 if [ -f $final_path/.htconfig.php ]; then
-	rm "$final_path/.htconfig.php"
+	ynh_secure_remove "$final_path/.htconfig.php"
 fi
 
 if [ -f $final_path/.htconfig.php ]; then
-	rm "$final_path/config/local.ini.php"
+	ynh_secure_remove "$final_path/config/local.ini.php"
 fi
 
 
@@ -123,7 +123,7 @@ ynh_replace_string --match_string="OPEN"  --replace_string="CLOSED" --target_fil
 
 
 #Copy Addons
-rm -Rf "$final_path/addon"
+ynh_secure_remove "$final_path/addon"
 ynh_setup_source --dest_dir="$final_path/addon" --source_id="addons"
 
 # 3 - some extra folders