Merge pull request #16 from YunoHost-Apps/testing

Testing

README.md

@@ -1,57 +1,54 @@
-# PHPSysInfo for Yunohost
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
+# PhpSysInfo for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/phpsysinfo.svg)](https://dash.yunohost.org/appci/app/phpsysinfo) ![](https://ci-apps.yunohost.org/ci/badges/phpsysinfo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpsysinfo.maintain.svg)  
+[![Install PhpSysInfo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpsysinfo)
 
-[![Install Custom Webapp with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=phpsysinfo)
+*[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allow you to install PHPSysInfo quickly and simply on a YunoHost server.  
+> *This package allows you to install PhpSysInfo 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.*
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
 A customizable PHP script that displays information about your system nicely.
 
-**Shipped version:** 3.3.4
+
-**License:** [GNU General Public License v2.0](https://github.com/phpsysinfo/phpsysinfo/blob/master/COPYING)
+**Shipped version:** 3.3.4~ynh1
+
+**Demo:** http://phpsysinfo.sourceforge.net/multi/index.php?disp=bootstrap&xml=raspbian
 
 ## Screenshots
-![screenshot phpsyinfo](https://a.fsdn.com/con/app/proj/phpsysinfo/screenshots/294411.jpg/max/max/1 "phpsysinfo screenshot")
 
-## Demo
+![](./doc/screenshots/screenshot.png)
-[Demo on NAS Synology](http://phpsysinfo.sourceforge.net/multi/index.php?disp=bootstrap&xml=synology)
+
+## Disclaimers / important information
 
 ## Configuration
+
 Edit `phpsysinfo.ini` in `/var/www/YOURPATH/phpsysinfo.ini`.
 
-## Documentation
+## Documentation and resources
 
-## YunoHost specific features
+* Official app website: https://phpsysinfo.github.io/phpsysinfo/
+* Official admin documentation: https://phpsysinfo.github.io/phpsysinfo/
+* Upstream app code repository: https://github.com/phpsysinfo/phpsysinfo/
+* YunoHost documentation for this app: https://yunohost.org/app_phpsysinfo
+* Report a bug: https://github.com/YunoHost-Apps/phpsysinfo_ynh/issues
 
-#### Multi-users support
+## Developer info
-No multi-users in this app. Simply a web page.
 
-#### Supported architectures
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/phpsysinfo_ynh/tree/testing).
-
-* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/phpsysinfo%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/phpsysinfo/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/phpsysinfo%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/phpsysinfo/)
-
-## Limitations
-
-## Additional information
-
-## Links
-* PHPSysInfo website: https://phpsysinfo.github.io/phpsysinfo/
----
-
-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/phpsysinfo_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/phpsysinfo_ynh/tree/testing --debug
 or
-sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/phpsysinfo_ynh/tree/testing --debug
+sudo yunohost app upgrade phpsysinfo -u https://github.com/YunoHost-Apps/phpsysinfo_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps

README_fr.md

@@ -0,0 +1,50 @@
+# PhpSysInfo pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/phpsysinfo.svg)](https://dash.yunohost.org/appci/app/phpsysinfo) ![](https://ci-apps.yunohost.org/ci/badges/phpsysinfo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpsysinfo.maintain.svg)  
+[![Installer PhpSysInfo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpsysinfo)
+
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *Ce package vous permet d'installer PhpSysInfo rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+
+## Vue d'ensemble
+
+A customizable PHP script that displays information about your system nicely.
+
+
+**Version incluse :** 3.3.4~ynh1
+
+**Démo :** http://phpsysinfo.sourceforge.net/multi/index.php?disp=bootstrap&xml=raspbian
+
+## Captures d'écran
+
+![](./doc/screenshots/screenshot.png)
+
+## Avertissements / informations importantes
+
+## Configuration
+
+Edit `phpsysinfo.ini` in `/var/www/YOURPATH/phpsysinfo.ini`.
+
+## Documentations et ressources
+
+* Site officiel de l'app : https://phpsysinfo.github.io/phpsysinfo/
+* Documentation officielle de l'admin : https://phpsysinfo.github.io/phpsysinfo/
+* Dépôt de code officiel de l'app : https://github.com/phpsysinfo/phpsysinfo/
+* Documentation YunoHost pour cette app : https://yunohost.org/app_phpsysinfo
+* Signaler un bug : https://github.com/YunoHost-Apps/phpsysinfo_ynh/issues
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/phpsysinfo_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/phpsysinfo_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade phpsysinfo -u https://github.com/YunoHost-Apps/phpsysinfo_ynh/tree/testing --debug
+```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

conf/app.src

@@ -3,5 +3,4 @@ SOURCE_SUM=5a0c880519df3c61b1c97c7bbb8c349dc2dde4f25e506478a0a643e47d25ff5e
 SOURCE_SUM_PRG=sha256sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/nginx.conf

@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file

doc/DESCRIPTION.md

@@ -0,0 +1 @@
+A customizable PHP script that displays information about your system nicely.

doc/DISCLAIMER.md

@@ -0,0 +1,3 @@
+## Configuration
+
+Edit `phpsysinfo.ini` in `/var/www/YOURPATH/phpsysinfo.ini`.

manifest.json

@@ -3,18 +3,25 @@
     "name": "PhpSysInfo",
     "packaging_format": 1,
     "description": {
-        "en": "A customizable PHP script that displays information about your system nicely.",
+        "en": "Customizable PHP script that displays information about your system nicely",
-        "fr": "Un script PHP paramétrable qui affiche des informations sur votre système."
+        "fr": "Un script PHP paramétrable qui affiche des informations sur votre système"
     },
     "version": "3.3.4~ynh1",
-    "url": "https://github.com/inrepublica/phpsysinfo_ynh/",
+    "url": "https://phpsysinfo.github.io/phpsysinfo/",
+    "upstream": {
+        "license": "GPL-3.0-only",
+        "website": "https://phpsysinfo.github.io/phpsysinfo/",
+        "demo": "http://phpsysinfo.sourceforge.net/multi/index.php?disp=bootstrap&xml=raspbian",
+        "admindoc": "https://phpsysinfo.github.io/phpsysinfo/",
+        "code": "https://github.com/phpsysinfo/phpsysinfo/"
+    },
     "license": "GPL-3.0-only",
     "maintainer": {
         "name": "inrepublica",
         "email": "duvalmickael@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.1.0"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -25,8 +32,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
+                "type": "domain"
-                "example": "domain.org"
             },
             {
                 "name": "path",
@@ -36,8 +42,7 @@
             },
 			{
                 "name": "admin",
-                "type": "user",
+                "type": "user"
-                "example": "johndoe"
             },
             {
                 "name": "is_public",

scripts/install

@@ -119,8 +119,6 @@ ynh_script_progression --message="Configuring permissions..."
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 

scripts/restore

@@ -37,10 +37,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS

scripts/upgrade

@@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 language=$(ynh_app_setting_get --app=$app --key=language)
 display_mode=$(ynh_app_setting_get --app=$app --key=display_mode)
@@ -27,7 +26,6 @@ display_mode=$(ynh_app_setting_get --app=$app --key=display_mode)
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
 
 upgrade_type=$(ynh_check_app_version_changed)
 
@@ -52,15 +50,6 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..."
 
-# Fix is_public as a boolean value
-if [ "$is_public" = "Yes" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=1
-	is_public=1
-elif [ "$is_public" = "No" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=0
-	is_public=0
-fi
-
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
 	final_path=/var/www/$app
@@ -94,6 +83,10 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================