YunoHost-Apps/friendica_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/friendica_ynh.git synced 2024-09-03 18:36:14 +02:00
Code Issues Activity Actions

Merge branch 'testing' into fix-git-upgrade

Browse source
This commit is contained in:
Éric Gaspar 2022-03-08 18:16:44 +01:00 • committed by GitHub
commit 4455880616
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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. 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 **Demo:** https://dir.friendica.social/servers

2
README_fr.md
View file

@ -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. 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 **Démo :** https://dir.friendica.social/servers

2
check_process
View file

@ -11,7 +11,7 @@
setup_private=0 setup_private=0
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=41c39d47e4e398339b7d6a4167ca2198dae998e3 #upgrade=1 from_commit=41c39d47e4e398339b7d6a4167ca2198dae998e3
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
change_url=1 change_url=1

5
conf/nginx.conf
View file

@ -3,10 +3,6 @@ location __PATH__/ {
alias __FINALPATH__/; alias __FINALPATH__/;
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
if (!-e $request_filename) { if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?pagename=$1; rewrite ^(.*)$ /index.php?pagename=$1;
} }
@ -44,7 +40,6 @@ location __PATH__/ {
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
} }
# deny access to all dot files # deny access to all dot files
location ~ /\. { location ~ /\. {
deny all; deny all;

4
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Social Communication Server", "en": "Social Communication Server",
"fr": "Serveur de Communication Social" "fr": "Serveur de Communication Social"
}, },
"version": "2021.09~ynh1", "version": "2022.02~ynh1",
"url": "http://friendi.ca", "url": "http://friendi.ca",
"upstream": { "upstream": {
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
@ -22,7 +22,7 @@
"email": "" "email": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.0" "yunohost": ">= 4.3.0"
}, },
"previous_maintainers": { "previous_maintainers": {
"name": "aymhce", "name": "aymhce",

4
scripts/_common.sh
View file

@ -10,8 +10,8 @@ addons_repo_url="https://github.com/friendica/friendica-addons.git"
# commit hashes # commit hashes
# 2021.09 # 2021.09
version_commit="1adbdfb8d1d0a476fb416ffaf3012a7a0f13deb1" version_commit="72c4ed95f16e82239924099254a3d8fc9638cd07"
addons_version_commit="b164910032a620bd637574bd4b42423ff8c067bb" addons_version_commit="dd6bf79e194ed5bdf0a40ee3c5ad76cceb24d31d"
# dependencies used by the app # dependencies used by the app
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="7.3"

2
scripts/install
View file

@ -90,7 +90,7 @@ popd
cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess" cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess"
# 2 - Clone addons repo # 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 # Reset addons branch to the level of update we needed
pushd "$final_path/addon" pushd "$final_path/addon"
git reset --hard --quiet $addons_version_commit git reset --hard --quiet $addons_version_commit