From 0cf7e06baa3309df5d112bb2cc2593b09cafa999 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Mon, 11 Sep 2023 16:57:47 +0200 Subject: [PATCH 1/6] Use console.php for entering/exiting maintenance mode. Also always exit maintenance, even if script fails. --- scripts/backup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/backup b/scripts/backup index 8dce025..597bead 100644 --- a/scripts/backup +++ b/scripts/backup @@ -15,7 +15,9 @@ source /usr/share/yunohost/helpers #================================================= ynh_print_info --message="Declaring files to be backed up..." -(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console maintenance 1) +(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console.php maintenance 1) + +trap "(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console.php maintenance 0)" EXIT #================================================= # BACKUP THE APP MAIN DIR @@ -61,8 +63,6 @@ ynh_print_info --message="Backing up the MySQL database..." ynh_mysql_dump_db --database="$db_name" > db.sql -(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console maintenance 0) - #================================================= # END OF SCRIPT #================================================= From 3f4c68c80b5c831eb3fdd0b1b67ab768aaad626e Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Tue, 12 Sep 2023 13:41:40 +0200 Subject: [PATCH 2/6] Exit maintenance mode in restore --- scripts/restore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/restore b/scripts/restore index 648fa0a..29f7215 100644 --- a/scripts/restore +++ b/scripts/restore @@ -57,6 +57,13 @@ ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload +#============== +# FINALIZATION +#============== + +# exit maintenance mode since the app was backed up while in maintenance mode +(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console.php maintenance 0) + #================================================= # END OF SCRIPT #================================================= From 9aaece6781176a026ac7749f152216678a4ce38f Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Tue, 12 Sep 2023 21:41:20 +0200 Subject: [PATCH 3/6] Use console.php for DB migrations as well. --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7901ba9..534cdea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failreg # Run Composer pushd "$install_dir" ynh_exec_as "$app" php$phpversion bin/composer.phar install --no-dev --quiet - ynh_exec_as "$app" php$phpversion bin/console dbstructure update + ynh_exec_as "$app" php$phpversion bin/console.php dbstructure update popd #================================================= From b9f863f5b2f22f360e41f6adadf459621dd28935 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 24 Dec 2023 17:16:06 +0100 Subject: [PATCH 4/6] Upgrade to v2023.12 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7b4243e..37929a6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Friendica" description.en = "Decentralized Social Network" description.fr = "Réseau social décentralisé" -version = "2023.05~ynh3" +version = "2023.12~ynh1" maintainers = [] @@ -49,8 +49,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/friendica/friendica/archive/refs/tags/2023.05.tar.gz" - sha256 = "727a8fdab6a2f6424d3dbc895496447e750eb0f8e1e11b70f1e229a7e3c9a31d" + url = "https://github.com/friendica/friendica/archive/refs/tags/2023.12.tar.gz" + sha256 = "d55475628ae24aab1ee7ed3367d22b2fd3ee49200b5da276c69e97df2afbd943" autoupdate.strategy = "latest_github_tag" [resources.sources.addons] From 9b0106d2a8dddddd39080eb1e02318233ae40d08 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 24 Dec 2023 16:16:09 +0000 Subject: [PATCH 5/6] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e0d5b74..9fc2139 100644 --- a/README.md +++ b/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~ynh3 +**Shipped version:** 2023.12~ynh1 **Demo:** https://dir.friendica.social/servers @@ -33,7 +33,7 @@ Friendica connects you effortlessly to a federated communications network of sev * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 460f2ad..1505640 100644 --- a/README_fr.md +++ b/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~ynh3 +**Version incluse :** 2023.12~ynh1 **Démo :** https://dir.friendica.social/servers @@ -33,7 +33,7 @@ Friendica connects you effortlessly to a federated communications network of sev * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 3af6731ebbc6ee900855c2cd3ac0fad6a5419ce8 Mon Sep 17 00:00:00 2001 From: Tio <38043315+tio-trom@users.noreply.github.com> Date: Sat, 10 Feb 2024 16:57:00 +0100 Subject: [PATCH 6/6] Updating the addons to the latest stable 2023.12 --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 37929a6..a9e635a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,8 +54,8 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.sources.addons] - url = "https://github.com/friendica/friendica-addons/archive/refs/tags/2023.05.tar.gz" - sha256 = "df29aed28c0208e162c76f91949d0c3a0f77fe09853fe1a6d854b9956075d8a0" + url = "https://github.com/friendica/friendica-addons/archive/refs/tags/2023.12.tar.gz" + sha256 = "d0228833584dd7dc0301ee04bd41728345c8051d84908849dea52ed04a7c8982" [resources.system_user]