From 424cdb371fa5c3f23d6655256de0cf72e51f20ef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 22 Mar 2022 12:21:33 +0100 Subject: [PATCH 1/7] Fix --- check_process | 2 +- conf/nginx.conf | 5 ++--- manifest.json | 6 ------ scripts/install | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/check_process b/check_process index fd35a8f..337be1f 100644 --- a/check_process +++ b/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 diff --git a/conf/nginx.conf b/conf/nginx.conf index 0bd2dce..a705a85 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,12 +1,11 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location / { # 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)(/.*)$; diff --git a/manifest.json b/manifest.json index 359cbb1..d58bc17 100644 --- a/manifest.json +++ b/manifest.json @@ -36,12 +36,6 @@ "name": "domain", "type": "domain" }, - { - "name": "path", - "type": "path", - "example": "/selfoss", - "default": "/selfoss" - }, { "name": "admin", "type": "user" diff --git a/scripts/install b/scripts/install index 7456ea6..8888c67 100755 --- a/scripts/install +++ b/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 From 462ab86fadcd6a3f89ab12c4f241df20ac5ab133 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 22 Mar 2022 13:33:30 +0100 Subject: [PATCH 2/7] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 11b7ae8..3643f6a 100644 --- a/scripts/upgrade +++ b/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) From 814a90d6366971285b33e4b86625e2bcff39b72f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 22 Mar 2022 13:48:24 +0100 Subject: [PATCH 3/7] Fix --- conf/config.ini | 11 +++++++++++ conf/defaults.ini | 2 +- manifest.json | 1 - scripts/_common.sh | 2 +- scripts/install | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 conf/config.ini diff --git a/conf/config.ini b/conf/config.ini new file mode 100644 index 0000000..fdcb8c8 --- /dev/null +++ b/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__ diff --git a/conf/defaults.ini b/conf/defaults.ini index fc17e70..6194928 100644 --- a/conf/defaults.ini +++ b/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__ diff --git a/manifest.json b/manifest.json index d58bc17..9239aac 100644 --- a/manifest.json +++ b/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" diff --git a/scripts/_common.sh b/scripts/_common.sh index 09586e3..d7e8145 100644 --- a/scripts/_common.sh +++ b/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}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 8888c67..ea2db47 100755 --- a/scripts/install +++ b/scripts/install @@ -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" From f129e9fbf43dfcc97d0e982172c5783f3bedd355 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 22 Mar 2022 12:48:30 +0000 Subject: [PATCH 4/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb46424..1f76b80 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al **Shipped version:** 2.18~ynh1 -**Demo:** https://demo.example.com + ## Screenshots diff --git a/README_fr.md b/README_fr.md index 8a3fe03..b1b8c53 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ 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 From 6caa12bde9397afbc6cd11b862c8f8a0b686e735 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 22 Mar 2022 13:54:55 +0100 Subject: [PATCH 5/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d7e8145..092c919 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="7.3" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-mbstring 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 From d74aa17aee59e86d789848b64c7741254eaceaf4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 22 Mar 2022 14:00:33 +0100 Subject: [PATCH 6/7] Update DISCLAIMER.md --- doc/DISCLAIMER.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..9ee37a2 100644 --- a/doc/DISCLAIMER.md +++ b/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` \ No newline at end of file From c3076b0e739097f26347f1aa92f14438c0ae8087 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 22 Mar 2022 13:00:37 +0000 Subject: [PATCH 7/7] Auto-update README --- README.md | 3 +++ README_fr.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/README.md b/README.md index 1f76b80..9958644 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,9 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al ![](./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/ diff --git a/README_fr.md b/README_fr.md index b1b8c53..a4813c0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,6 +22,9 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al ![](./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/