Merge pull request #1 from YunoHost-Apps/path

Path

README.md

@@ -20,12 +20,15 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al
 
 **Shipped version:** 2.18~ynh1
 
-**Demo:** https://demo.example.com
+
 
 ## Screenshots
 
 ![](./doc/screenshots/screenshot1.png)
 
+## Disclaimers / important information
+
+password hash for optional login. You can generate a password hash by using following page of your selfoss installation. `http://your_selfoss_url.com/password`
 ## Documentation and resources
 
 * Official app website: https://selfoss.aditu.de/

README_fr.md

@@ -16,12 +16,15 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al
 
 **Version incluse :** 2.18~ynh1
 
-**Démo :** https://demo.example.com
+
 
 ## Captures d'écran
 
 ![](./doc/screenshots/screenshot1.png)
 
+## Avertissements / informations importantes
+
+password hash for optional login. You can generate a password hash by using following page of your selfoss installation. `http://your_selfoss_url.com/password`
 ## Documentations et ressources
 
 * Site officiel de l'app : https://selfoss.aditu.de/

check_process

@@ -8,7 +8,7 @@
 		password="1Strong-Password"
 	; Checks
 		pkg_linter=1
-		setup_sub_dir=1
+		setup_sub_dir=0
 		setup_root=1
 		setup_nourl=0
 		setup_private=1

conf/config.ini

@@ -0,0 +1,11 @@
+[globals]
+db_type=mysql
+db_host=localhost
+db_database=__DB_NAME__
+db_username=__DB_USER__
+db_password=__DB_PWD__
+db_port=3306
+
+username=__ADMIN__
+password=__PASSWORD__
+salt=__SALT__

conf/defaults.ini

@@ -12,7 +12,7 @@ logger_destination=file:data/logs/default.log
 logger_level=DEBUG
 items_perpage=50
 items_lifetime=30
-base_url=__PATH__/
+base_url=/
 username=__ADMIN__
 password=__PASSWORD__
 salt=__SALT__

conf/nginx.conf

@@ -1,12 +1,11 @@
-#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location / {
-location __PATH__/ {
 
   # Path to source
   alias __FINALPATH__/;
 
   index index.php;
 
-  try_files $uri __PATH__/public/$uri __PATH__/index.php;
+  try_files $uri /public/$uri /index.php;
 
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;

doc/DISCLAIMER.md

@@ -0,0 +1 @@
+password hash for optional login. You can generate a password hash by using following page of your selfoss installation. `http://your_selfoss_url.com/password`

manifest.json

@@ -11,7 +11,6 @@
     "upstream": {
         "license": "AGPL-3.0-only",
         "website": "https://selfoss.aditu.de/",
-        "demo": "https://demo.example.com",
         "admindoc": "https://github.com/fossar/selfoss/wiki",
         "userdoc": "https://selfoss.aditu.de/",
         "code": "https://github.com/fossar/selfoss"
@@ -36,12 +35,6 @@
                 "name": "domain",
                 "type": "domain"
             },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/selfoss",
-                "default": "/selfoss"
-            },
             {
                 "name": "admin",
                 "type": "user"

scripts/_common.sh

@@ -7,7 +7,7 @@
 YNH_PHP_VERSION="7.3"
 
 # dependencies used by the app
-pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
+pkg_dependencies="php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
 
 #=================================================
 # PERSONAL HELPERS

scripts/install

@@ -21,7 +21,7 @@ ynh_abort_if_errors
 #=================================================
 
 domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
+path_url="/"
 admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
@@ -112,7 +112,7 @@ ynh_add_fpm_config --usage=low --footprint=low
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/defaults.ini" --destination="$final_path/config.ini"
+ynh_add_config --template="../conf/config.ini" --destination="$final_path/config.ini"
 
 chmod 400 "$final_path/config.ini"
 chown $app:$app "$final_path/config.ini"

scripts/upgrade

@@ -25,6 +25,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 salt=$(ynh_app_setting_get --app=$app --key=salt)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)