Merge pull request #38 from YunoHost-Apps/testing

Testing

README.md

@@ -1,15 +1,15 @@
-# 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)  
-[![Integration level](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica)  
 [![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 know 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.
 
-[Friendica](http://friendi.ca/) integration for YunoHost<br>
+**Version:** 2020.03
-**Version:2020.03**<br><br>
 
 Current snapshot in *sources*:
 
@@ -25,12 +25,10 @@ Before installing, read the [Friendica installation instructions](https://github
 #### Multi-users support
 
 LDAP auth supported. There are not yet active SSO.
-<br><br>
 
 # To-do
 - [ ] Fail2Ban support
 
-
 ## Installation
 
 ### Register a new domain and add it to YunoHost
@@ -43,19 +41,25 @@ Use the YunoHost admin panel to install Friendica by entering the GitHub repo ad
 
 Make sure to select your domain from the previous section as the application domain.
 
-After the installation,login with the username provided at the time of the installaion with your SSO password.You can then create your profile and access the admin panel from the button in the center of the top nav bar, just adjecent to the search bar.<b>(The admin panel don't have text,so don't get confuse with it) </b>
+After the installation,login with the username provided at the time of the installaion with your SSO password.You can then create your profile and access the admin panel from the button in the center of the top nav bar, just adjecent to the search bar.<b>(The admin panel don't have text,so don't get confuse with it)
 Public users can register and use the instance as normal users. SSO users can login with there username and password as normal users too.
 
-Developers info
+## 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
 
-**Only if you want to use a testing branch for coding, instead of merging directly into master.**
 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.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
 or
-sudo yunohost app upgrade REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
+sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
 ```
-

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

@@ -82,11 +82,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
 
 
@@ -121,7 +121,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