Merge pull request #4 from YunoHost-Apps/testing

Testing
2024-09-03 20:16:21 +02:00 · 2022-12-23 22:36:58 +01:00 · 2022-12-23 22:36:58 +01:00 · 57478708ac
commit 57478708ac
parent 4c9879e42b c896156daf
7 changed files with 56 additions and 40 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Selfoss for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/selfoss.svg)](https://dash.yunohost.org/appci/app/selfoss) ![](https://ci-apps.yunohost.org/ci/badges/selfoss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/selfoss.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/selfoss.svg)](https://dash.yunohost.org/appci/app/selfoss) ![Working status](https://ci-apps.yunohost.org/ci/badges/selfoss.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/selfoss.maintain.svg)  
 [![Install Selfoss with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=selfoss)

 *[Lire ce readme en français.](./README_fr.md)*
@ -20,33 +20,32 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al

 **Shipped version:** 2.18~ynh1

-
-
 ## Screenshots

-![](./doc/screenshots/screenshot1.png)
+![Screenshot of Selfoss](./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/
-* Official user documentation: https://selfoss.aditu.de/
-* Official admin documentation: https://github.com/fossar/selfoss/wiki
-* Upstream app code repository: https://github.com/fossar/selfoss
-* YunoHost documentation for this app: https://yunohost.org/app_selfoss
-* Report a bug: https://github.com/YunoHost-Apps/selfoss_ynh/issues
+* Official app website: <https://selfoss.aditu.de/>
+* Official user documentation: <https://selfoss.aditu.de/>
+* Official admin documentation: <https://github.com/fossar/selfoss/wiki>
+* Upstream app code repository: <https://github.com/fossar/selfoss>
+* YunoHost documentation for this app: <https://yunohost.org/app_selfoss>
+* Report a bug: <https://github.com/YunoHost-Apps/selfoss_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/selfoss_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/selfoss_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade selfoss -u https://github.com/YunoHost-Apps/selfoss_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,10 +1,14 @@
+<!--
+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.
+-->
+
 # Selfoss pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/selfoss.svg)](https://dash.yunohost.org/appci/app/selfoss) ![](https://ci-apps.yunohost.org/ci/badges/selfoss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/selfoss.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/selfoss.svg)](https://dash.yunohost.org/appci/app/selfoss) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/selfoss.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/selfoss.maintain.svg)  
 [![Installer Selfoss avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=selfoss)

 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*

 > *Ce package vous permet d'installer Selfoss 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.*
@ -16,33 +20,32 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al

 **Version incluse :** 2.18~ynh1

-
-
 ## Captures d'écran

-![](./doc/screenshots/screenshot1.png)
+![Capture d'écran de Selfoss](./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/
-* Documentation officielle utilisateur : https://selfoss.aditu.de/
-* Documentation officielle de l'admin : https://github.com/fossar/selfoss/wiki
-* Dépôt de code officiel de l'app : https://github.com/fossar/selfoss
-* Documentation YunoHost pour cette app : https://yunohost.org/app_selfoss
-* Signaler un bug : https://github.com/YunoHost-Apps/selfoss_ynh/issues
+* Site officiel de l'app : <https://selfoss.aditu.de/>
+* Documentation officielle utilisateur : <https://selfoss.aditu.de/>
+* Documentation officielle de l'admin : <https://github.com/fossar/selfoss/wiki>
+* Dépôt de code officiel de l'app : <https://github.com/fossar/selfoss>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_selfoss>
+* Signaler un bug : <https://github.com/YunoHost-Apps/selfoss_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/selfoss_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/selfoss_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade selfoss -u https://github.com/YunoHost-Apps/selfoss_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
--- a/2
+++ b/2
@ -5,7 +5,7 @@
 		is_public=1
 	; Checks
 		pkg_linter=1
-		setup_sub_dir=0
+		setup_sub_dir=1
 		setup_root=1
 		setup_nourl=0
 		setup_private=1
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -1,28 +1,36 @@
-location / {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {

  # Path to source
  alias __FINALPATH__/;

-  index index.php;
+  # index.php is a router, it contains a lot of routes:
+  # / is serving the home page, /update is refreshing all feeds, etc.
+  # So we need to rewrite all URLs to give them to the router inside index.php
+  rewrite ^__PATH__/.*$ __PATH__/index.php?$args;

-  try_files $uri /public/$uri /index.php;
+  # feeds favicons and thumbnails are stored in subfolder data
+  location ~ ^__PATH__/((favicons|thumbnails)/.+)$ {
+    try_files __PATH__/data/$1 =404;
+  }

+  # statics assets are stored in public folder
+  location ~ ^__PATH__/(.*\.(js|ico|gif|jpg|png|css|map|asc|txt|svg|xml|webmanifest)).*$ {
+    try_files __PATH__/public/$1 =404;
+  }
+
+  # Regex to match PHP files
  location ~ [^/]\.php(/|$) {
    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;

    fastcgi_index index.php;
    include fastcgi_params;
-    fastcgi_param REMOTE_USER     $remote_user;
-    fastcgi_param PATH_INFO       $fastcgi_path_info;
+    fastcgi_param REMOTE_USER $remote_user;
+    fastcgi_param PATH_INFO $fastcgi_path_info;
    fastcgi_param SCRIPT_FILENAME $request_filename;
  }

-  location ~ ^/(favicons|thumbnails)/.*$ {
-        try_files $uri /data/$uri;
-    }
-
-  location ~* ^/(data\/logs|data\/sqlite|config\.ini|\.ht) {
-        deny all;
-    }
+  # Include SSOWAT user panel.
+  include conf.d/yunohost_panel.conf.inc;
 }
--- a/manifest.json
+++ b/manifest.json
@ -34,6 +34,12 @@
                "name": "domain",
                "type": "domain"
            },
+            {
+                "name": "path",
+                "type": "path",
+                "example": "/selfoss",
+                "default": "/selfoss"
+            },
            {
                "name": "is_public",
                "type": "boolean",
--- a/scripts/install
+++ b/scripts/install
@ -21,7 +21,7 @@ ynh_abort_if_errors
 #=================================================

 domain=$YNH_APP_ARG_DOMAIN
-path_url="/"
+path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC

 app=$YNH_APP_INSTANCE_NAME
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -61,7 +61,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1

 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data"
+	ynh_setup_source --dest_dir="$final_path" --keep="data"
 fi

 chmod 750 "$final_path"