Merge pull request #79 from ericgaspar/update-to-upstream

Update to upstream
2024-10-01 13:34:46 +02:00 · 2020-06-25 13:12:05 +02:00 · 2020-06-25 13:12:05 +02:00 · e27175c2dd
commit e27175c2dd
parent e7f2f574e9 e266067992
12 changed files with 47 additions and 61 deletions
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to

 Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator.

-**Shipped version:** 20191209
+**Shipped version:** 2020.06.18

 ## Screenshots

--- a/README_fr.md
+++ b/README_fr.md
@ -12,7 +12,7 @@ Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/#/insta

 Tiny-Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS / Atom) en ligne gratuit et open source.

-**Version incluse :** 20191209
+**Version incluse :** 2020.06.18

 ## Captures d’écran

@ -63,6 +63,6 @@ Merci de faire vos pull request sur la [testing branch](https://github.com/YunoH
 Pour essayer la branche testing, procédez comme suit.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade ttrss -u https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug
 ```
--- a/5
+++ b/5
@ -10,7 +10,6 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
-		upgrade=1	from_commit=bed542465ee917060d802d8764b006c755b09422
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
@ -21,7 +20,3 @@
 ;;; Options
 Email=
 Notification=none
-;;; Upgrade options
-	; commit=bed542465ee917060d802d8764b006c755b09422
-		name=Move cron's remove
-		manifest_arg=domain=DOMAIN&path=PATH&
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/44ef447c0f3c4cd5d5bbd02b2971ea80422a8439.tar.gz
-SOURCE_SUM=13e75d7419fbc0a96d73fcd09755f91a3d8c90fb6a85992f8b2e6f80f433d434
+SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/6eb94f1e1397ae97ed9a0e78d0edc2d04b0915a6.tar.gz
+SOURCE_SUM=01f7d9acd9e6e5b67c7b9142e165a60b81a767962c3deaa7eafac46002c5608e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/manifest.json
+++ b/manifest.json
@ -3,10 +3,10 @@
  "id": "ttrss",
  "packaging_format": 1,
  "description": {
-    "en": "A PHP and Ajax feed reader",
-    "fr": "Un lecteur de flux en PHP et Ajax"
+    "en": "News feed (RSS/Atom) reader and aggregator.",
+    "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom."
  },
-  "version": "20191209~ynh1",
+  "version": "20200618~ynh1",
  "url": "http://tt-rss.org",
  "license": "GPL-3.0-only",
  "maintainer": {
@ -28,8 +28,8 @@
      "name": "domain",
      "type": "domain",
      "ask": {
-        "en": "Choose a domain for Tiny-Tiny-RSS",
-        "fr": "Choisissez un domaine pour Tiny-Tiny-RSS"
+        "en": "Choose a domain for Tiny Tiny RSS",
+        "fr": "Choisissez un domaine pour Tiny Tiny RSS"
      },
      "example": "domain.org"
    },
@ -37,8 +37,8 @@
      "name": "path",
      "type": "path",
      "ask": {
-        "en": "Choose a path for Tiny-Tiny-RSS",
-        "fr": "Choisissez un chemin pour Tiny-Tiny-RSS"
+        "en": "Choose a path for Tiny Tiny RSS",
+        "fr": "Choisissez un chemin pour Tiny Tiny RSS"
      },
      "example": "/ttrss",
      "default": "/ttrss"
--- a/pull_request_template.md
+++ b/pull_request_template.md
@ -2,7 +2,7 @@
 - *Description of why you made this PR*

 ## Solution
- *And how you fix that*
+- *And how do you fix that problem*

 ## PR Status
 - [ ] Code finished.
@ -11,14 +11,8 @@
 - [ ] Upgrade from last version tested.
 - [ ] Can be reviewed and tested.

-## Validation
+## Package_check results
 ---
-*Minor decision*
- **Upgrade previous version** : 
- [ ] **Code review** : 
- [ ] **Approval (LGTM)** : 
- [ ] **Approval (LGTM)** : 
- **CI succeeded** : 
-[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/ttrss_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/ttrss_ynh%20PR-NUM-/)  
-*Please replace '-NUM-' in this link by the PR number.*  
-When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
+*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
+
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/ttrss_ynh_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/ttrss_ynh_ynh%20PR-NUM-%20(USERNAME)/)  
--- a/scripts/backup
+++ b/scripts/backup
@ -17,7 +17,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=2
+ynh_print_info --message="Loading installation settings..."

 app=$YNH_APP_INSTANCE_NAME

@ -26,46 +26,43 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)

 #=================================================
-# STANDARD BACKUP STEPS
+# DECLARE DATA AND CONF FILES TO BACKUP
+#=================================================
+ynh_print_info --message="Declaring files to be backed up..."
+
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Backing up the main app directory..."

 ynh_backup --src_path="$final_path"

 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up nginx web server configuration..."

 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"

 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up php-fpm configuration..."

 ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"

-#=================================================
-# BACKUP THE MYSQL DATABASE
-#=================================================
-ynh_script_progression --message="Backing up the MySQL database..."
-
-ynh_mysql_dump_db --database="$db_name" > db.sql
-
-#=================================================
-# SPECIFIC BACKUP
 #=================================================
 # BACKUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Backing up systemd configuration..."

 ynh_backup --src_path="/etc/systemd/system/$app.service"

+#=================================================
+# BACKUP THE MYSQL DATABASE
+#=================================================
+ynh_print_info --message="Backing up the MySQL database..."
+
+ynh_mysql_dump_db --database="$db_name" > db.sql
+
 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
--- a/scripts/change_url
+++ b/scripts/change_url
@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+ynh_script_progression --message="Loading installation settings..."  --weight=1

 final_path=$(ynh_app_setting_get --app=$app --key=final_path)

@ -87,7 +87,7 @@ ynh_replace_string --match_string="define('SELF_URL_PATH'.*" --replace_string="d
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading nginx web server..."  --weight=2

 ynh_systemd_action --service_name=nginx --action=reload

--- a/scripts/install
+++ b/scripts/install
@ -28,7 +28,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..."
+ynh_script_progression --message="Validating installation parameters..." --weight=1

 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
@ -42,7 +42,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..."
+ynh_script_progression --message="Storing installation settings..." --weight=1

 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
@ -77,7 +77,7 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..."
+ynh_script_progression --message="Configuring nginx web server..." --weight=2

 # Create a dedicated nginx config
 ynh_add_nginx_config
@ -103,7 +103,7 @@ ynh_add_fpm_config
 #=================================================
 # CONFIGURE TTRSS
 #=================================================
-ynh_script_progression --message="Configuring ttrss..."
+ynh_script_progression --message="Configuring ttrss..." --weight=1

 cp ../conf/config.php "$final_path/config.php"

@ -143,7 +143,7 @@ ynh_exec_as $app php ${final_path}/update.php --update-schema
 #=================================================
 # START TTRSS IN BACKGROUND
 #=================================================
-ynh_script_progression --message="Starting ttrss..."
+ynh_script_progression --message="Starting ttrss..." --weight=1

 ynh_systemd_action --service_name=$app --action=start

@ -158,7 +158,7 @@ yunohost service add $app
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..."
+ynh_script_progression --message="Configuring SSOwat..." --weight=1

 ynh_app_setting_set --app=$app --key=skipped_uris --value="/public.php,/api,/opml.php?op=publish"

--- a/scripts/remove
+++ b/scripts/remove
@ -68,7 +68,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..."
+ynh_script_progression --message="Removing nginx web server configuration..." --weight=1

 # Remove the dedicated nginx config
 ynh_remove_nginx_config
@ -86,7 +86,7 @@ ynh_remove_fpm_config
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..."
+ynh_script_progression --message="Removing the dedicated system user..." --weight=1

 # Delete a system user
 ynh_system_user_delete --username=$app
--- a/scripts/restore
+++ b/scripts/restore
@ -19,7 +19,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading settings..."
+ynh_script_progression --message="Loading settings..."  --weight=1

 app=$YNH_APP_INSTANCE_NAME

@ -55,7 +55,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..."
+ynh_script_progression --message="Restoring the app main directory..." --weight=2

 ynh_restore_file --origin_path="$final_path"

@ -103,7 +103,7 @@ ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..."
+ynh_script_progression --message="Restoring the systemd configuration..."  --weight=2

 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+ynh_script_progression --message="Loading installation settings..."  --weight=1

 app=$YNH_APP_INSTANCE_NAME

@ -30,7 +30,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..."
+ynh_script_progression --message="Ensuring downward compatibility..."  --weight=2

 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
@ -107,7 +107,7 @@ ynh_add_nginx_config
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..."
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1

 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
@ -183,7 +183,7 @@ chown -R $app $final_path/{cache,feed-icons,lock}
 #=================================================
 # RESTART TTRSS
 #=================================================
-ynh_script_progression --message="Restarting ttrss..."
+ynh_script_progression --message="Restarting ttrss..." --weight=1

 ynh_systemd_action --service_name=$app --action=restart