Merge pull request #16 from YunoHost-Apps/testing

Testing

README.md

@@ -31,7 +31,6 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al
 * 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

README_fr.md

@@ -30,7 +30,6 @@ Selfoss est un lecteur RSS polyvalent et une application Web d'agrégation de fl
 * 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

check_process

@@ -1,24 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		path="/path"
-		is_public=1
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=1
-		setup_root=1
-		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		#upgrade=1	from_commit=CommitHash
-		backup_restore=1
-		multi_instance=1
-		change_url=1
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

conf/cron

@@ -1 +1 @@
-*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/cliupdate.php >>/var/log/selfoss_update.log > /dev/null
+*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/cliupdate.php >> __INSTALL_DIR__/data/logs/cliupdate.log

manifest.toml

@@ -5,7 +5,7 @@ name = "Selfoss"
 description.en = "Multipurpose RSS reader"
 description.fr = "Lecteur RSS polyvalent"
 
-version = "2.19~ynh2"
+version = "2.19~ynh3"
 
 maintainers = ["eric_G"]
 
@@ -52,4 +52,4 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "sqlite3, php8.2-xml, php8.2-sqlite3, php8.2-mbstring, php8.2-mysql, php8.2-gd, php8.2-curl"
+    packages = "sqlite3, php8.2-xml, php8.2-sqlite3, php8.2-mbstring, php8.2-gd, php8.2-curl"

scripts/install

@@ -49,7 +49,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config.ini" --destination="$install_dir/config.ini"
+ynh_add_config --template="config.ini" --destination="$install_dir/config.ini"
 
 chmod 400 "$install_dir/config.ini"
 chown $app:$app "$install_dir/config.ini"
@@ -59,7 +59,7 @@ chown $app:$app "$install_dir/config.ini"
 #=================================================
 ynh_script_progression --message="Setuping a cron..." --weight=1
 
-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
 

scripts/upgrade

@@ -21,19 +21,19 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # If fpm_footprint doesn't exist, create it
-if [ -z "$fpm_footprint" ]; then
+if [ -z "${fpm_footprint:-}" ]; then
     fpm_footprint=low
     ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 fi
 
 # If fpm_free_footprint doesn't exist, create it
-if [ -z "$fpm_free_footprint" ]; then
+if [ -z "${fpm_free_footprint:-}" ]; then
     fpm_free_footprint=0
     ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
 fi
 
 # If fpm_usage doesn't exist, create it
-if [ -z "$fpm_usage" ]; then
+if [ -z "${fpm_usage:-}" ]; then
     fpm_usage=low
     ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 fi
@@ -60,7 +60,7 @@ chmod g+w $install_dir/data/cache $install_dir/data/favicons $install_dir/data/l
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -70,11 +70,20 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config.ini" --destination="$install_dir/config.ini"
+ynh_add_config --template="config.ini" --destination="$install_dir/config.ini"
 
 chmod 400 "$install_dir/config.ini"
 chown $app:$app "$install_dir/config.ini"
 
+#=================================================
+# SETUP A CRON
+#=================================================
+ynh_script_progression --message="Setuping a cron..." --weight=1
+
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
+
 #=================================================
 # END OF SCRIPT
 #=================================================