diff --git a/README.md b/README.md index df5457c..5f68f08 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:** 2021.09~ynh1 +**Shipped version:** 2022.02~ynh1 **Demo:** https://dir.friendica.social/servers diff --git a/README_fr.md b/README_fr.md index 5c7cac6..75f61e5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,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 :** 2021.09~ynh1 +**Version incluse :** 2022.02~ynh1 **Démo :** https://dir.friendica.social/servers diff --git a/check_process b/check_process index 7f2551c..ff18b03 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=41c39d47e4e398339b7d6a4167ca2198dae998e3 + #upgrade=1 from_commit=41c39d47e4e398339b7d6a4167ca2198dae998e3 backup_restore=1 multi_instance=1 change_url=1 diff --git a/conf/nginx.conf b/conf/nginx.conf index 4cf40ae..013c29d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,10 +3,6 @@ location __PATH__/ { alias __FINALPATH__/; - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - if (!-e $request_filename) { rewrite ^(.*)$ /index.php?pagename=$1; } @@ -44,7 +40,6 @@ location __PATH__/ { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } - # deny access to all dot files location ~ /\. { deny all; diff --git a/manifest.json b/manifest.json index caac2b8..704cf4a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Social Communication Server", "fr": "Serveur de Communication Social" }, - "version": "2021.09~ynh1", + "version": "2022.02~ynh1", "url": "http://friendi.ca", "upstream": { "license": "AGPL-3.0-only", @@ -22,7 +22,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "previous_maintainers": { "name": "aymhce", diff --git a/scripts/_common.sh b/scripts/_common.sh index af03e7c..a59c7a1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,8 +10,8 @@ addons_repo_url="https://github.com/friendica/friendica-addons.git" # commit hashes # 2021.09 -version_commit="1adbdfb8d1d0a476fb416ffaf3012a7a0f13deb1" -addons_version_commit="b164910032a620bd637574bd4b42423ff8c067bb" +version_commit="72c4ed95f16e82239924099254a3d8fc9638cd07" +addons_version_commit="dd6bf79e194ed5bdf0a40ee3c5ad76cceb24d31d" # dependencies used by the app YNH_PHP_VERSION="7.3" diff --git a/scripts/install b/scripts/install index cf530e8..22c0748 100644 --- a/scripts/install +++ b/scripts/install @@ -90,7 +90,7 @@ popd cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess" # 2 - Clone addons repo -git clone --quiet $addons_repo_url -b stable "$final_path/addon" +git clone --quiet $addons_repo_url -b develop "$final_path/addon" # Reset addons branch to the level of update we needed pushd "$final_path/addon" git reset --hard --quiet $addons_version_commit