Merge pull request #113 from YunoHost-Apps/testing

Testing

README.md

@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services.
 Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted.
 
-**Shipped version:** 2023.05~ynh2
+**Shipped version:** 2023.05~ynh3
 
 **Demo:** https://dir.friendica.social/servers
 

README_fr.md

@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services.
 Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted.
 
-**Version incluse :** 2023.05~ynh2
+**Version incluse :** 2023.05~ynh3
 
 **Démo :** https://dir.friendica.social/servers
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Friendica"
 description.en = "Decentralized Social Network"
 description.fr = "Réseau social décentralisé"
 
-version = "2023.05~ynh2"
+version = "2023.05~ynh3"
 
 maintainers = []
 
@@ -56,7 +56,6 @@ ram.runtime = "50M"
         [resources.sources.addons]
         url = "https://github.com/friendica/friendica-addons/archive/refs/tags/2023.05.tar.gz"
         sha256 = "df29aed28c0208e162c76f91949d0c3a0f77fe09853fe1a6d854b9956075d8a0"
-        autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
 
@@ -66,7 +65,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php8.2-curl php8.2-mbstring php8.2-imagick php8.2-xml php8.2-zip php8.2-mysql php8.2-gd php8.2-gmp"
+    packages = "mariadb-server, php8.2-curl, php8.2-mbstring, php8.2-imagick, php8.2-xml, php8.2-zip, php8.2-mysql, php8.2-gd, php8.2-gmp"
 
     [resources.database]
     type = "mysql"

scripts/install

@@ -44,7 +44,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 # Create a dedicated PHP-FPM configy
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 # Create a dedicated nginx config
 ynh_add_nginx_config

scripts/upgrade

@@ -22,15 +22,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
-#=================================================
-# CHECK THE PATH
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=3
-
-if [ -f "/etc/cron.d/$app" ]; then
-  ynh_secure_remove --file="/etc/cron.d/$app"
-fi
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -56,10 +47,14 @@ ynh_script_progression --message="Upgrading system configurations related to $ap
 ynh_add_nginx_config
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 ynh_use_logrotate --non-append
 
+ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
+
 # Create a dedicated Fail2Ban config
 ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="^.*authenticate\: failed login attempt.*\"ip\"\:\"<HOST>\".*$"