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

Merge branch 'testing' into pr/95

This commit is contained in:
Éric Gaspar 2023-08-20 18:28:40 +02:00
commit 996cad7e6e
5 changed files with 22 additions and 19 deletions

View file

@ -5,7 +5,8 @@ It shall NOT be edited by hand.
# Friendica for YunoHost
[![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)
[![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)
*[Lire ce readme en français.](./README_fr.md)*
@ -19,7 +20,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:** 2023.01~ynh1
**Shipped version:** 2023.09~ynh1
**Demo:** https://dir.friendica.social/servers

View file

@ -5,7 +5,8 @@ It shall NOT be edited by hand.
# Friendica pour YunoHost
[![Niveau dinté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)
[![Niveau dinté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)
*[Read this readme in english.](./README.md)*
@ -19,7 +20,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 :** 2023.01~ynh1
**Version incluse :** 2023.09~ynh1
**Démo :** https://dir.friendica.social/servers

View file

@ -6,7 +6,7 @@
"en": "Social Communication Server",
"fr": "Serveur de Communication Social"
},
"version": "2023.01~ynh1",
"version": "2023.09~ynh1",
"url": "http://friendi.ca",
"upstream": {
"license": "AGPL-3.0-only",
@ -27,7 +27,7 @@
"email": "aymhce@gmail.com"
},
"requirements": {
"yunohost": ">= 11.0.9"
"yunohost": ">= 11.2"
},
"multi_instance": true,
"services": [

View file

@ -12,7 +12,7 @@ addons_version_commit="8f29a512770d0bbf568f053adae20a82f1b0050f"
# dependencies used by the app
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 php${YNH_PHP_VERSION}-gmp"
#=================================================
# EXPERIMENTAL HELPERS

View file

@ -119,12 +119,7 @@ ynh_add_nginx_config
#=================================================
# ADD A CONFIGURATION
#=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_add_config --template="../conf/local-sample.config.php" --destination="$final_path/config/local.config.php"
# init db
ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < "$final_path/database.sql"
ynh_script_progression --message="Adding the LDAP Auth addon configuration file..." --weight=1
# LDAP addon config
ynh_add_config --template="../conf/addon.config.php" --destination="$final_path/config/addon.config.php"
@ -145,7 +140,7 @@ chmod -R 775 "$final_path/view/smarty3"
#=================================================
# SETUP A CRON
#=================================================
ynh_script_progression --message="Setuping a cron job..." --weight=1
ynh_script_progression --message="Setting up the cron job..." --weight=1
ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
chown root: "/etc/cron.d/$app"
@ -154,14 +149,20 @@ chmod 644 "/etc/cron.d/$app"
#=================================================
# INSTALL FRIENDICA
#=================================================
ynh_script_progression --message="Install Friendica..." --weight=1
# Run composer
pushd "$final_path"
ynh_exec_as "$app" php$phpversion bin/composer.phar install --no-dev --quiet
ynh_exec_as "$app" bin/console config system addon ldapauth
popd
# Import Composer dependencies
ynh_exec_as "$app" php$phpversion bin/composer.phar install --no-dev --quiet
ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "INSERT INTO addon (id, name, version, installed, hidden, timestamp, plugin_admin) VALUES (NULL, 'ldapauth', '', '1', '0', UNIX_TIMESTAMP(), '0');"
# Install application
ynh_exec_as "$app" php$phpversion bin/console.php autoinstall\
--dbhost "localhost" --dbdata "$db_name" --dbuser "$db_user" --dbpass "$db_pwd"\
--admin "$email" --tz "$timezone" --lang "$language" --url "https://$domain$path_url"
# Enable LDAP Auth addon
ynh_exec_as "$app" php$phpversion bin/console.php addon enable ldapauth
popd
#=================================================
# RELOAD NGINX