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 #72 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2022-06-13 22:11:18 +02:00 committed by GitHub
commit 3df23a9569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Friendica for YunoHost # Friendica for YunoHost
[![Integration level](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![Working status](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg)
[![Install Friendica with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=friendica) [![Install Friendica with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=friendica)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -19,13 +19,13 @@ 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.03~ynh1
**Demo:** https://dir.friendica.social/servers **Demo:** https://dir.friendica.social/servers
## Screenshots ## Screenshots
![](./doc/screenshots/friendica-vier-profile.png) ![Screenshot of Friendica](./doc/screenshots/friendica-vier-profile.png)
## Disclaimers / important information ## Disclaimers / important information
@ -51,22 +51,23 @@ Use the YunoHost admin panel to install Friendica by entering the GitHub repo ad
## Documentation and resources ## Documentation and resources
* Official app website: http://friendi.ca * Official app website: <http://friendi.ca>
* Official user documentation: https://wiki.friendi.ca/ * Official user documentation: <https://wiki.friendi.ca/>
* Official admin documentation: https://github.com/friendica/friendica/wiki * Official admin documentation: <https://github.com/friendica/friendica/wiki>
* Upstream app code repository: https://github.com/friendica/friendica * Upstream app code repository: <https://github.com/friendica/friendica>
* YunoHost documentation for this app: https://yunohost.org/app_friendica * YunoHost documentation for this app: <https://yunohost.org/app_friendica>
* Report a bug: https://github.com/YunoHost-Apps/friendica_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/friendica_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
or or
sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

29
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# Friendica pour YunoHost # Friendica pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg) [![Niveau d'intégration](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg)
[![Installer Friendica avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=friendica) [![Installer Friendica avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=friendica)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Friendica rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer Friendica rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -15,13 +19,13 @@ 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.03~ynh1
**Démo :** https://dir.friendica.social/servers **Démo :** https://dir.friendica.social/servers
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/friendica-vier-profile.png) ![Capture d'écran de Friendica](./doc/screenshots/friendica-vier-profile.png)
## Avertissements / informations importantes ## Avertissements / informations importantes
@ -47,22 +51,23 @@ https://github.com/YunoHost-Apps/friendica_ynh
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : http://friendi.ca * Site officiel de l'app : <http://friendi.ca>
* Documentation officielle utilisateur : https://wiki.friendi.ca/ * Documentation officielle utilisateur : <https://wiki.friendi.ca/>
* Documentation officielle de l'admin : https://github.com/friendica/friendica/wiki * Documentation officielle de l'admin : <https://github.com/friendica/friendica/wiki>
* Dépôt de code officiel de l'app : https://github.com/friendica/friendica * Dépôt de code officiel de l'app : <https://github.com/friendica/friendica>
* Documentation YunoHost pour cette app : https://yunohost.org/app_friendica * Documentation YunoHost pour cette app : <https://yunohost.org/app_friendica>
* Signaler un bug : https://github.com/YunoHost-Apps/friendica_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/friendica_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

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.03~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",

6
scripts/_common.sh
View file

@ -5,9 +5,9 @@
#================================================= #=================================================
# commit hashes # commit hashes
# 2021.09 # 2022.03
version_commit="1adbdfb8d1d0a476fb416ffaf3012a7a0f13deb1" version_commit="f660c3894411d5a55ad201b0da8d46715b5b5002"
addons_version_commit="b164910032a620bd637574bd4b42423ff8c067bb" addons_version_commit="c35a6d58345ef7f99534f465d8453bccdca80450"
# 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 https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" git clone --quiet https://github.com/friendica/friendica-addons.git -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