From cd7bcc6e56bbe97a3c4ee8f4a47eba589a5742b3 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Mon, 31 Jul 2023 00:41:36 +0200 Subject: [PATCH 1/9] New version of main sources --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 1274f88..e710ba9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://codeberg.org/streams/streams/archive/c6cfd33c0e1b88e30399a4f9efd557512bb9ec86.tar.gz -SOURCE_SUM=a336c9f70109459bc167736aaa9211fba05a009110d8d0e9586af126337c8ec8 +SOURCE_URL=https://codeberg.org/streams/streams/archive/b7db8b66261fa6a18dc59890d5461c2fb85242fa.tar.gz +SOURCE_SUM=adf9e6a18cdea8df8dd22fb35afc201c2a8660327c055ef445fbae89190d8df1 SOURCE_FORMAT=tar.gz From 918e639fbed41493eca0e2489b98b6dde1adceb0 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Mon, 31 Jul 2023 17:55:27 +0200 Subject: [PATCH 2/9] upstream version update --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 29646ce..75ba81e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source fediverse server", "fr": "Un serveur fediverse open source" }, - "version": "23.07.24~ynh1", + "version": "23.07.31~ynh1", "url": "https://codeberg.org/streams/streams", "upstream": { "license": "Public Domain", From 9ac669331fd80fb2e63ea551c2cfab2647ba49fb Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Tue, 1 Aug 2023 00:57:16 +0200 Subject: [PATCH 3/9] Some minor code cleanup --- conf/app.src | 5 +++-- conf/poller-cron | 2 +- manifest.json | 6 +++--- scripts/backup | 4 ++-- scripts/install | 8 ++++---- scripts/remove | 4 ++-- scripts/restore | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) mode change 100755 => 100644 scripts/install diff --git a/conf/app.src b/conf/app.src index e710ba9..a8ba835 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,4 @@ -SOURCE_URL=https://codeberg.org/streams/streams/archive/b7db8b66261fa6a18dc59890d5461c2fb85242fa.tar.gz -SOURCE_SUM=adf9e6a18cdea8df8dd22fb35afc201c2a8660327c055ef445fbae89190d8df1 +SOURCE_URL=https://codeberg.org/streams/streams/archive/2ae1943eb9c26b3c798d1c7289d356612c9b6644.tar.gz +SOURCE_SUM=7a5f8ddc4d5dcf417e980103c5191bd8d899a96a2fa62cb13ed92bd216b30d25 +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/conf/poller-cron b/conf/poller-cron index 6640bae..90c6d28 100644 --- a/conf/poller-cron +++ b/conf/poller-cron @@ -1,2 +1,2 @@ # Run poller periodically to update your website -*/10 * * * * __APP__ cd __FINALPATH__; /usr/bin/php__PHPVERSION__ Code/Daemon/Run.php Cron > /dev/null 2>&1 +*/10 * * * * __APP__ ; /usr/bin/php__PHPVERSION__ __FINALPATH__/Code/Daemon/Run.php Cron > /dev/null 2>&1 diff --git a/manifest.json b/manifest.json index 75ba81e..b2d3d46 100644 --- a/manifest.json +++ b/manifest.json @@ -42,13 +42,13 @@ }, { "name": "database", - "type": "string", + "type": "select", "ask": { "en": "Choose the database to be used for your website [mysql:1,postgresql:2]", "fr": "Choisissez la base de données utilisée pour votre site [mysql:1,postgresql:2]" }, - "choices": ["1", "2"], - "default": "1" + "choices": ["mysql", "postgresql"], + "default": "mysql" } ] } diff --git a/scripts/backup b/scripts/backup index d39ad02..ce592cf 100755 --- a/scripts/backup +++ b/scripts/backup @@ -59,10 +59,10 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # BACKUP OF THE DATABASE #================================================= -if [ $database -eq 1 ]; then +if [ $database == "mysql" ]; then ynh_print_info --message="Backup of the MySQL database..." ynh_mysql_dump_db --database="$db_name" > db.sql -elif [ $database -eq 2 ]; then +elif [ $database == "postgresql" ]; then # Removing postgresSQL database ynh_print_info --message="Backup of the postgreSQL database..." ynh_psql_dump_db --database="$db_name" > db.sql diff --git a/scripts/install b/scripts/install old mode 100755 new mode 100644 index 58857f3..b1588f5 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,7 @@ path_url="/" admin=$YNH_APP_ARG_ADMIN email=$(ynh_user_get_info --username=$admin --key=mail) upload="256M" -database="1" +database="mysql" random_string=$(ynh_string_random --length=48) database=`expr $YNH_APP_ARG_DATABASE` @@ -63,7 +63,7 @@ ynh_app_setting_set --app=$app --key=random_string --value=$random_string ynh_print_info "Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies_main -if [ $database -eq 2 ]; then +if [ $database == "mysql" ]; then ynh_install_app_dependencies $pkg_dependencies_psql fi @@ -150,7 +150,7 @@ chown -R $app:www-data "$final_path" # CREATE A DATABASE #================================================= -if [ $database -eq 1 ]; then +if [ $database == "mysql" ]; then ynh_script_progression --message="Creating a MySQL database..." db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name @@ -158,7 +158,7 @@ if [ $database -eq 1 ]; then ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name ynh_script_progression --message="Importing database..." ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_mysql.sql -elif [ $database -eq 2 ]; then +elif [ $database == "postgresql" ]; then # Create postgresql database ynh_script_progression --message="Creating a postgresql database..." ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$config" diff --git a/scripts/remove b/scripts/remove index 8655412..0cdae83 100755 --- a/scripts/remove +++ b/scripts/remove @@ -26,10 +26,10 @@ database=$(ynh_app_setting_get --app=$app --key=database) # REMOVE THE DATABASE #================================================= -if [ $database -eq 1 ]; then +if [ $database == "mysql" ]; then ynh_script_progression --message="Removing MySQL database..." ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -elif [ $database -eq 2 ]; then +elif [ $database == "postgresql" ]; then # Removing postgresql database ynh_script_progression --message="Removing postgreSQL database..." ynh_psql_remove_db --db_user=$db_user --db_name=$db_name diff --git a/scripts/restore b/scripts/restore index 315f8af..69b7979 100755 --- a/scripts/restore +++ b/scripts/restore @@ -74,12 +74,12 @@ ynh_script_progression --message="Restoring the database..." ynh_install_app_dependencies $pkg_dependencies_main -if [ $database -eq 1 ]; then +if [ $database == "mysql" ]; then ynh_script_progression --message="Restoring MySQL database..." db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql -elif [ $database -eq 2 ]; then +elif [ $database == "postgresql" ]; then # Reinstalling postgresql database ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies From a1b24746573830e5172dcff202094c3f6380d5f9 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Tue, 1 Aug 2023 01:10:38 +0200 Subject: [PATCH 4/9] Get sources from *tar.gz files & disable LDAP auth --- manifest.json | 4 ++-- scripts/install | 53 +++++++++++-------------------------------------- 2 files changed, 14 insertions(+), 43 deletions(-) diff --git a/manifest.json b/manifest.json index b2d3d46..dcfa804 100644 --- a/manifest.json +++ b/manifest.json @@ -44,8 +44,8 @@ "name": "database", "type": "select", "ask": { - "en": "Choose the database to be used for your website [mysql:1,postgresql:2]", - "fr": "Choisissez la base de données utilisée pour votre site [mysql:1,postgresql:2]" + "en": "Choose the database to be used for your website", + "fr": "Choisissez la base de données utilisée pour votre site" }, "choices": ["mysql", "postgresql"], "default": "mysql" diff --git a/scripts/install b/scripts/install index b1588f5..bc376a9 100644 --- a/scripts/install +++ b/scripts/install @@ -83,8 +83,10 @@ ynh_system_user_create --username=$app --home_dir="$final_path" ynh_script_progression --message="Setting up Streams source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path + # Download, check integrity, uncompress and patch the source from app.src -git clone https://codeberg.org/streams/streams.git "$final_path" --quiet +ynh_setup_source --dest_dir="$final_path" + # 2 - Composer ynh_script_progression --message="Pulling in external libraries with Composer..." @@ -92,41 +94,10 @@ ynh_script_progression --message="Pulling in external libraries with Composer... ynh_install_composer # 3 - Streams Addons +# Download, check integrity, uncompress and patch the addons from app_addons.src +ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons" -# Make addon Directory and unpack the addons to this directory -ynh_script_progression --message="Setting up Streams addons source files..." - -pushd "$final_path" - mkdir -p extend/addon/zaddons - mkdir addon - git clone https://codeberg.org/streams/streams-addons.git $final_path/extend/addon/zaddons --quiet - filelist=(`ls extend/addon/zaddons`) - cd addon - for a in "${filelist[@]}" ; do - base=`basename $a` - if [ $base = '.git' ]; then - #echo 'ignoring git' - continue; - fi - if [ ! -d ../extend/addon/zaddons/$base ]; then - #echo $a 'not a directory' - continue; - fi - if [ -x $base ]; then - #echo $base 'file exists' - continue; - fi - - echo linking $base - - ln -s ../extend/addon/zaddons/$base $base - done - -popd - - - -# 3 - Some extra folders +# 4 - Some extra folders ynh_script_progression --message="Creating smarty3 folder for personal data..." mkdir -p "${final_path}/store" @@ -192,9 +163,9 @@ ynh_replace_string --match_string= "//ini_set('display_errors', '0');" --replace sed -i "s/\['php_path'\] = 'php';/\['php_path'\] = 'php$phpversion';/g" "$config" # addon LDAP config -ynh_script_progression --message="Push Ldap configuration to .htconfig.php..." +#ynh_script_progression --message="Push Ldap configuration to .htconfig.php..." -cat ../conf/ldap_conf.php >> $final_path/.htconfig.php +#cat ../conf/ldap_conf.php >> $final_path/.htconfig.php #================================================= # NGINX CONFIGURATION @@ -253,11 +224,11 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= # LDAP ADDON ACTIVATION #================================================= -ynh_script_progression --message="Enabling ldapauth addon..." +#ynh_script_progression --message="Enabling ldapauth addon..." -pushd "$final_path" - /usr/bin/php8.2 util/addons install ldapauth -popd +#pushd "$final_path" +# /usr/bin/php8.2 util/addons install ldapauth +#popd #================================================= # END OF SCRIPT From 98a36bd85459bddf647410eba10a2d3f21b456cb Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Wed, 2 Aug 2023 09:54:48 +0200 Subject: [PATCH 5/9] upstream version update --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index a8ba835..cc58869 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://codeberg.org/streams/streams/archive/2ae1943eb9c26b3c798d1c7289d356612c9b6644.tar.gz -SOURCE_SUM=7a5f8ddc4d5dcf417e980103c5191bd8d899a96a2fa62cb13ed92bd216b30d25 +SOURCE_URL=https://codeberg.org/streams/streams/archive/671af1429054b1146ad73739a33dcffa65f9138e.tar.gz +SOURCE_SUM=d36ae7fcd5526f3f1bee54c2820b682b3a1d6474dcd0bc29fb475a706e7274dc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index dcfa804..c76050a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source fediverse server", "fr": "Un serveur fediverse open source" }, - "version": "23.07.31~ynh1", + "version": "23.08.02~ynh1", "url": "https://codeberg.org/streams/streams", "upstream": { "license": "Public Domain", From ee47d6b1b66db01fef59876c8fa851fb80f68386 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Wed, 2 Aug 2023 11:48:10 +0200 Subject: [PATCH 6/9] upgrade script was using git pull --- scripts/install | 5 ++-- scripts/upgrade | 78 +++++++++++++------------------------------------ 2 files changed, 22 insertions(+), 61 deletions(-) diff --git a/scripts/install b/scripts/install index bc376a9..4059ec7 100644 --- a/scripts/install +++ b/scripts/install @@ -82,12 +82,10 @@ ynh_system_user_create --username=$app --home_dir="$final_path" # 1 - Streams ynh_script_progression --message="Setting up Streams source files..." -ynh_app_setting_set --app=$app --key=final_path --value=$final_path - # Download, check integrity, uncompress and patch the source from app.src +ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_setup_source --dest_dir="$final_path" - # 2 - Composer ynh_script_progression --message="Pulling in external libraries with Composer..." @@ -95,6 +93,7 @@ ynh_install_composer # 3 - Streams Addons # Download, check integrity, uncompress and patch the addons from app_addons.src +ynh_script_progression --message="Setting up Streams addons source files..." ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons" # 4 - Some extra folders diff --git a/scripts/upgrade b/scripts/upgrade index f15212e..a6b0a92 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,6 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers +#================================================= +# CHECK VERSION +#================================================= + +upgrade_type=$(ynh_check_app_version_changed) + #================================================= # LOAD SETTINGS #================================================= @@ -81,68 +87,24 @@ ynh_system_user_create --username=$app --home_dir="$final_path" ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src -# ynh_setup_source --dest_dir="$final_path" -if [ `cd $final_path && git rev-parse --is-inside-work-tree` ]; then - pushd "$final_path" - git pull --quiet - ynh_install_composer - cd extend/addon/zaddons - git pull --quiet - cd ../../.. - filelist=(`ls extend/addon/zaddons`) - cd addon - for a in "${filelist[@]}" ; do - base=`basename $a` - if [ $base = '.git' ]; then - #echo 'ignoring git' - continue; - fi - if [ ! -d ../extend/addon/zaddons/$base ]; then - #echo $a 'not a directory' - continue; - fi - if [ -x $base ]; then - #echo $base 'file exists' - continue; - fi - - echo linking $base - - ln -s ../extend/addon/zaddons/$base $base - done - for x in `ls` ; do - if [ -L "$x" ] && ! [ -e "$x" ]; then - echo "removing dead symlink $x" ; - rm -- "$x"; - fi; - done - popd - chmod -R 775 $final_path/store -else - - # Create a temporary directory - tmpdir="$(ynh_smart_mktemp 6000)" - # Backup the config file in the temp dir - cp -a "$final_path/.htconfig.php" "$tmpdir/.htconfig.php" - cp -a "$final_path/store" "$tmpdir/store" - cp -a "$final_path/php.log" "$tmpdir/php.log" - cp -a "$final_path/cache" "$tmpdir/cache" - - # Remove the app directory securely - ynh_secure_remove "$final_path" +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" - cp -a "$tmpdir/cache" "${final_path}" - cp -a "$tmpdir/store" "${final_path}" - cp -a "$tmpdir/.htconfig.php" "${final_path}" - cp -a "$tmpdir/php.log" "${final_path}" - ynh_secure_remove --file="$tmpdir" - chmod -R 775 $final_path/store - mkdir $final_path/addon - ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons" + # Composer update + ynh_script_progression --message="Pulling in external libraries with Composer..." + + ynh_install_composer + + ynh_script_progression --message="Setting up Streams addons source files..." + + # Download, check integrity, uncompress and patch the addons from app_addons.src + + ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons" fi chmod 750 "$final_path" @@ -202,7 +164,7 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies_main -if [ $database -eq 2 ]; then +if [ $database == "postgresql" ]; then ynh_install_app_dependencies $pkg_dependencies_psql fi From 7c24530a387b0507db042560666b8b6cbf42c8a9 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Wed, 2 Aug 2023 16:09:50 +0200 Subject: [PATCH 7/9] upstream sources update --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index cc58869..3b562c1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://codeberg.org/streams/streams/archive/671af1429054b1146ad73739a33dcffa65f9138e.tar.gz -SOURCE_SUM=d36ae7fcd5526f3f1bee54c2820b682b3a1d6474dcd0bc29fb475a706e7274dc +SOURCE_URL=https://codeberg.org/streams/streams/archive/8ac9e679aa07c80f4793864a00aecb2530dbbed3.tar.gz +SOURCE_SUM=916dcdcd53d6d594c6d7d1377df45cd64175ec53e19626e7560fb84758a1950d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index c76050a..4553ea5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source fediverse server", "fr": "Un serveur fediverse open source" }, - "version": "23.08.02~ynh1", + "version": "23.08.02~ynh2", "url": "https://codeberg.org/streams/streams", "upstream": { "license": "Public Domain", From c194f962ab07976dd509d005d903e5a0669c9cf6 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Wed, 2 Aug 2023 20:10:23 +0200 Subject: [PATCH 8/9] Empty README files --- README.md | 80 +--------------------------------------------------- README_fr.md | 80 +--------------------------------------------------- 2 files changed, 2 insertions(+), 158 deletions(-) diff --git a/README.md b/README.md index 61d3cfe..0d011a2 100644 --- a/README.md +++ b/README.md @@ -1,79 +1 @@ - - -# Zap for YunoHost - -[![Integration level](https://dash.yunohost.org/integration/zap.svg)](https://dash.yunohost.org/appci/app/zap) ![Working status](https://ci-apps.yunohost.org/ci/badges/zap.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/zap.maintain.svg) - -[![Install Zap with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zap) - -*[Lire ce readme en français.](./README_fr.md)* - -> *This package allows you to install Zap quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* - -## Overview - -[Zap](https://zotlabs.com/zap/) is an an ethical alternative to Fediverse that provides powerful features for creating interconnected websites featuring a decentralized identity, communications, and permissions framework built using common webserver technology. - -Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. - -## Unique Features of ZAP - -- **Groups** : public, private, and moderated. -- **Events** : Calendar and attendance; automatic birthday notifications for friends using this feature. -- **Cloud**storage : Built-in network file storage integrated with social networking access. -- **Editor** : Supports both markdown and bbcode. Use either or both - if you want. -- **Share**: Drag-and-drop a number of different things such as files, photos, webpages, maps, phone numbers to share- them. -- **Lists**: Sometimes referred to as circles or aspects, this lets you define your own groups of related friends and- communicate with them as a private group. -- **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. - - -**Shipped version:** 21.11.28~ynh1 -## Disclaimers / important information - -## Installation - -Before installing, read the [Zap installation instructions](https://codeberg.org/zot/zap/src/branch/release/install/INSTALL.txt) for important information about: - -### Register a new domain and add it to YunoHost - -- Zap requires a dedicated domain, so obtain one and add it using the YunoHost admin panel. **Domains -> Add domain**. As Zap uses the full domain and is installed on the root, you can create a subdomain such as Zap.domain.tld. Don't forget to update your DNS if you manage them manually. - -## LDAP Admin user rights, logs and failed database updates - -- **For admin rights**: When installation is complete, you will need to visit your new hub's page and login with the **admin account username** which was entered at the time of installation process. You should then be able to create your first channel and have the **admin rights** for the hub. - -- **For normal YunoHost users :** Normal LDAP users can login through Ldap authentication and create there channels. - -- **Failing to get admin rights :** If the admin cannot access the admin settings at `https://zap.example.com/admin` or you want to grant admin rights to any other user(s) on the hub, then you have to **manually add 4096** to the **account_roles** under **accounts** for that user in the **database through phpMYAdmin**. - -- **For logs:** Go to **admin->logs** and enter the file name **php.log**. - -- **Failed Database after Upgrade:** Some times databse upgrade fails after version upgrade. You can go to hub eg. `https://zap.example.com/admin/dbsync/` and check the numbers of failled update. These updates will have to be ran manually by **phpMYAdmin**. - -## :red_circle: Antifeatures - -- **Upstream not maintained**: This software is not maintained anymore. Expect it to break down over time, be exposed to unfixed security breaches, etc. - -## Documentation and resources - -* Upstream app code repository: -* YunoHost documentation for this app: -* Report a bug: - -## Developer info - -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/zap_ynh/tree/testing). - -To try the testing branch, please proceed like that. - -``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/zap_ynh/tree/testing --debug -or -sudo yunohost app upgrade zap -u https://github.com/YunoHost-Apps/zap_ynh/tree/testing --debug -``` - -**More info regarding app packaging:** +# Streams for YunoHost diff --git a/README_fr.md b/README_fr.md index bd83268..951fd52 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,79 +1 @@ - - -# Zap pour YunoHost - -[![Niveau d’intégration](https://dash.yunohost.org/integration/zap.svg)](https://dash.yunohost.org/appci/app/zap) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/zap.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/zap.maintain.svg) - -[![Installer Zap avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zap) - -*[Read this readme in english.](./README.md)* - -> *Ce package vous permet d’installer Zap 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.* - -## Vue d’ensemble - -[Zap](https://zotlabs.com/zap/) is an an ethical alternative to Fediverse that provides powerful features for creating interconnected websites featuring a decentralized identity, communications, and permissions framework built using common webserver technology. - -Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. - -## Unique Features of ZAP - -- **Groups** : public, private, and moderated. -- **Events** : Calendar and attendance; automatic birthday notifications for friends using this feature. -- **Cloud**storage : Built-in network file storage integrated with social networking access. -- **Editor** : Supports both markdown and bbcode. Use either or both - if you want. -- **Share**: Drag-and-drop a number of different things such as files, photos, webpages, maps, phone numbers to share- them. -- **Lists**: Sometimes referred to as circles or aspects, this lets you define your own groups of related friends and- communicate with them as a private group. -- **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. - - -**Version incluse :** 21.11.28~ynh1 -## Avertissements / informations importantes - -## Installation - -Before installing, read the [Zap installation instructions](https://codeberg.org/zot/zap/src/branch/release/install/INSTALL.txt) for important information about: - -### Register a new domain and add it to YunoHost - -- Zap requires a dedicated domain, so obtain one and add it using the YunoHost admin panel. **Domains -> Add domain**. As Zap uses the full domain and is installed on the root, you can create a subdomain such as Zap.domain.tld. Don't forget to update your DNS if you manage them manually. - -## LDAP Admin user rights, logs and failed database updates - -- **For admin rights**: When installation is complete, you will need to visit your new hub's page and login with the **admin account username** which was entered at the time of installation process. You should then be able to create your first channel and have the **admin rights** for the hub. - -- **For normal YunoHost users :** Normal LDAP users can login through Ldap authentication and create there channels. - -- **Failing to get admin rights :** If the admin cannot access the admin settings at `https://zap.example.com/admin` or you want to grant admin rights to any other user(s) on the hub, then you have to **manually add 4096** to the **account_roles** under **accounts** for that user in the **database through phpMYAdmin**. - -- **For logs:** Go to **admin->logs** and enter the file name **php.log**. - -- **Failed Database after Upgrade:** Some times databse upgrade fails after version upgrade. You can go to hub eg. `https://zap.example.com/admin/dbsync/` and check the numbers of failled update. These updates will have to be ran manually by **phpMYAdmin**. - -## :red_circle: Fonctions indésirables - -- **Upstream not maintained**: This software is not maintained anymore. Expect it to break down over time, be exposed to unfixed security breaches, etc. - -## Documentations et ressources - -* Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : -* Signaler un bug : - -## Informations pour les développeurs - -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/zap_ynh/tree/testing). - -Pour essayer la branche testing, procédez comme suit. - -``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/zap_ynh/tree/testing --debug -ou -sudo yunohost app upgrade zap -u https://github.com/YunoHost-Apps/zap_ynh/tree/testing --debug -``` - -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +# Streams pour YunoHost From e6a4d7c6ef0d82d97908cfdfe4ef340584347da8 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Thu, 3 Aug 2023 14:31:08 +0200 Subject: [PATCH 9/9] Remove LADP related stuff in DISCLAIMER.md --- doc/DISCLAIMER.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 045bcc7..3d0f34f 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -2,11 +2,9 @@ - Your Streams based website requires a dedicated domain, so obtain one and add it using the YunoHost admin panel. **Domains -> Add domain**. As your website uses the full domain and is installed on the root, you can create a subdomain such as mywebsite.domain.tld. Don't forget to update your DNS if you manage them manually. -## LDAP Admin user rights, logs and failed database updates +## Admin user rights, logs and failed database updates -- **For admin rights**: When installation is complete, you will need to visit your new website and login with the **admin account username** which was entered at the time of installation process. You should then be able to create your first channel and have the **admin rights** for your website. - -- **For normal YunoHost users :** Normal LDAP users can login through LDAP authentication and create their channels. +- **For admin rights**: When installation is complete, you will need to visit your new website and create an account with the **admin e-mail address** which was chosen at the time of installation process. You should then be able to create your first channel and have the **admin rights** for your website. - **Failing to get admin rights :** If the admin cannot access the admin settings at `https://mywebsite.domain.tld/admin` or you want to grant admin rights to any other registered user(s) on your website, then you have to **manually add 4096** to the **account_roles** under **accounts** for that user in the **database through software like phpMYAdmin**.