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 pull request #81 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2022-11-12 14:59:04 +01:00 committed by GitHub
commit 5eef2b9cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 66 additions and 58 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:** 2022.06~ynh1 **Shipped version:** 2022.10~ynh1
**Demo:** https://dir.friendica.social/servers **Demo:** https://dir.friendica.social/servers

2
README_fr.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.
**Version incluse :** 2022.06~ynh1 **Version incluse :** 2022.10~ynh1
**Démo :** https://dir.friendica.social/servers **Démo :** https://dir.friendica.social/servers

20
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": "2022.06~ynh1", "version": "2022.10~ynh1",
"url": "http://friendi.ca", "url": "http://friendi.ca",
"upstream": { "upstream": {
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
@ -14,7 +14,8 @@
"demo": "https://dir.friendica.social/servers", "demo": "https://dir.friendica.social/servers",
"admindoc": "https://github.com/friendica/friendica/wiki", "admindoc": "https://github.com/friendica/friendica/wiki",
"userdoc": "https://wiki.friendi.ca/", "userdoc": "https://wiki.friendi.ca/",
"code": "https://github.com/friendica/friendica" "code": "https://github.com/friendica/friendica",
"cpe": "cpe:2.3:a:friendica:friendica"
}, },
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"maintainer": { "maintainer": {
@ -26,16 +27,16 @@
"email": "aymhce@gmail.com" "email": "aymhce@gmail.com"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm", "php7.4-fpm",
"mysql" "mysql"
], ],
"arguments": { "arguments": {
"install" : [ "install": [
{ {
"name": "domain", "name": "domain",
"type": "domain" "type": "domain"
@ -51,7 +52,14 @@
"en": "Choose the application language", "en": "Choose the application language",
"fr": "Choisissez la langue de l'application" "fr": "Choisissez la langue de l'application"
}, },
"choices": ["de", "en", "es", "fr", "it", "pt"], "choices": [
"de",
"en",
"es",
"fr",
"it",
"pt"
],
"default": "en" "default": "en"
} }
] ]

6
scripts/_common.sh
View file

@ -6,11 +6,11 @@
# commit hashes # commit hashes
# 2022.06 # 2022.06
version_commit="7fe7d0c90437283bd0e83a7e571e1c032e5168ea" version_commit="ca3dcdad04a69b91f67c0e7567d391a48d944bf9"
addons_version_commit="7bb3595d467868170f95fe231edaecf0dd4e84a1" addons_version_commit="e0ad3e0fc778ce202021fb5e2dd3cc2a94496b8c"
# dependencies used by the app # 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" 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"

2
scripts/install
View file

@ -98,7 +98,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 https://github.com/friendica/friendica-addons.git -b develop "$final_path/addon" 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 # 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