diff --git a/README.md b/README.md index f9ce629..98547f0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Friendica is a decentralised communications platform that integrates social comm 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:** 2022.06~ynh1 +**Shipped version:** 2022.10~ynh1 **Demo:** https://dir.friendica.social/servers diff --git a/README_fr.md b/README_fr.md index 6633e87..e9ffa47 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Friendica is a decentralised communications platform that integrates social comm 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 :** 2022.06~ynh1 +**Version incluse :** 2022.10~ynh1 **Démo :** https://dir.friendica.social/servers diff --git a/manifest.json b/manifest.json index f38d21c..4dfde4c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,59 +1,67 @@ { - "name": "Friendica", - "id": "friendica", - "packaging_format": 1, - "description": { - "en": "Social Communication Server", - "fr": "Serveur de Communication Social" - }, - "version": "2022.06~ynh1", - "url": "http://friendi.ca", - "upstream": { + "name": "Friendica", + "id": "friendica", + "packaging_format": 1, + "description": { + "en": "Social Communication Server", + "fr": "Serveur de Communication Social" + }, + "version": "2022.10~ynh1", + "url": "http://friendi.ca", + "upstream": { "license": "AGPL-3.0-only", "website": "http://friendi.ca", "demo": "https://dir.friendica.social/servers", "admindoc": "https://github.com/friendica/friendica/wiki", "userdoc": "https://wiki.friendi.ca/", - "code": "https://github.com/friendica/friendica" - }, - "license": "AGPL-3.0-only", - "maintainer": { - "name": "Anmol Sharma", - "email": "" - }, - "previous_maintainers": { - "name": "aymhce", - "email": "aymhce@gmail.com" - }, - "requirements": { - "yunohost": ">= 4.3.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "php7.3-fpm", - "mysql" + "code": "https://github.com/friendica/friendica", + "cpe": "cpe:2.3:a:friendica:friendica" + }, + "license": "AGPL-3.0-only", + "maintainer": { + "name": "Anmol Sharma", + "email": "" + }, + "previous_maintainers": { + "name": "aymhce", + "email": "aymhce@gmail.com" + }, + "requirements": { + "yunohost": ">= 11.0.9" + }, + "multi_instance": true, + "services": [ + "nginx", + "php7.4-fpm", + "mysql" ], "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["de", "en", "es", "fr", "it", "pt"], - "default": "en" - } - ] + "install": [ + { + "name": "domain", + "type": "domain" + }, + { + "name": "admin", + "type": "user" + }, + { + "name": "language", + "type": "string", + "ask": { + "en": "Choose the application language", + "fr": "Choisissez la langue de l'application" + }, + "choices": [ + "de", + "en", + "es", + "fr", + "it", + "pt" + ], + "default": "en" + } + ] } -} +} \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 43b3013..a4ce60c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,11 +6,11 @@ # commit hashes # 2022.06 -version_commit="7fe7d0c90437283bd0e83a7e571e1c032e5168ea" -addons_version_commit="7bb3595d467868170f95fe231edaecf0dd4e84a1" +version_commit="ca3dcdad04a69b91f67c0e7567d391a48d944bf9" +addons_version_commit="e0ad3e0fc778ce202021fb5e2dd3cc2a94496b8c" # dependencies used by the app -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd" diff --git a/scripts/install b/scripts/install index 2b528a7..39c1463 100644 --- a/scripts/install +++ b/scripts/install @@ -87,7 +87,7 @@ ynh_script_progression --message="Setting up source files..." --weight=5 ynh_app_setting_set --app=$app --key=final_path --value=$final_path -# 1 - Clone stable repo +# 1 - Clone stable repo git clone --quiet https://github.com/friendica/friendica.git -b stable "$final_path" # Reset branch to the level of update we needed pushd "$final_path" @@ -97,8 +97,8 @@ popd # Copy .htaccess-dist to ..htaccess cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess" -# 2 - Clone addons repo -git clone --quiet https://github.com/friendica/friendica-addons.git -b develop "$final_path/addon" +# 2 - Clone addons repo +git clone --quiet https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" # Reset addons branch to the level of update we needed pushd "$final_path/addon" git reset --hard --quiet $addons_version_commit