From 84e154099cd50fd9c2914040fc2672cda75cb588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 23:36:32 +0200 Subject: [PATCH 1/8] cleaning --- conf/htconfig.sample.php | 9 +++++++++ conf/ldap_conf.php | 7 ------- scripts/install | 9 --------- scripts/upgrade | 38 +++++++++++++++++--------------------- 4 files changed, 26 insertions(+), 37 deletions(-) delete mode 100644 conf/ldap_conf.php diff --git a/conf/htconfig.sample.php b/conf/htconfig.sample.php index af51076b..bcbf4551 100644 --- a/conf/htconfig.sample.php +++ b/conf/htconfig.sample.php @@ -92,3 +92,12 @@ error_reporting(E_ERROR | E_WARNING | E_PARSE ); ini_set('error_log','php.log'); ini_set('log_errors','1'); ini_set('display_errors', '0'); + + +App::$config['system']['addon'] = 'ldapauth'; + +App::$config['ldapauth']['ldap_server'] = 'localhost'; +App::$config['ldapauth']['ldap_searchdn'] = 'ou=users,dc=yunohost,dc=org'; +App::$config['ldapauth']['ldap_userattr'] = 'uid'; +App::$config['ldapauth']['ldap_autocreateaccount_emailattribute'] = 'mail'; +App::$config['ldapauth']['create_account'] = '1'; diff --git a/conf/ldap_conf.php b/conf/ldap_conf.php deleted file mode 100644 index a4688d69..00000000 --- a/conf/ldap_conf.php +++ /dev/null @@ -1,7 +0,0 @@ -App::$config['system']['addon'] = 'ldapauth'; - -App::$config['ldapauth']['ldap_server'] = 'localhost'; -App::$config['ldapauth']['ldap_searchdn'] = 'ou=users,dc=yunohost,dc=org'; -App::$config['ldapauth']['ldap_userattr'] = 'uid'; -App::$config['ldapauth']['ldap_autocreateaccount_emailattribute'] = 'mail'; -App::$config['ldapauth']['create_account'] = '1'; diff --git a/scripts/install b/scripts/install index edaeb1dd..286d88ff 100755 --- a/scripts/install +++ b/scripts/install @@ -36,11 +36,6 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= # CREATE A DATABASE #================================================= - - -#================================================= -# CREATE A MYSQL DATABASE -#================================================= ynh_script_progression --message="Creating a database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) @@ -109,10 +104,6 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php" -# addon ldap config -ynh_script_progression --message="Push LDAP configuration to .htconfig.php..." - -cat ../conf/ldap_conf.php >> $install_dir/.htconfig.php ynh_store_file_checksum --file=$install_dir/.htconfig.php chmod 600 "$install_dir/.htconfig.php" diff --git a/scripts/upgrade b/scripts/upgrade index 0d6242e7..407279ea 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,31 +93,27 @@ ynh_add_nginx_config #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." --weight=1 +# ynh_script_progression --message="Updating a configuration file..." --weight=1 -if [ $database = "mysql" ]; then - db_type=0 - db_name=$(ynh_sanitize_dbid --db_name=$app) - db_user=$db_name - db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) - # Change your databases character set and collation - ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ - <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" -elif [ $database = "postgresql" ]; then - db_type=1 - db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -fi +# if [ $database = "mysql" ]; then +# db_type=0 +# db_name=$(ynh_sanitize_dbid --db_name=$app) +# db_user=$db_name +# db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +# # Change your databases character set and collation +# ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ +# <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" +# elif [ $database = "postgresql" ]; then +# db_type=1 +# db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +# fi -ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php" +# ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php" -# addon ldap config -ynh_script_progression --message="Push LDAP configuration to .htconfig.php..." +# ynh_store_file_checksum --file=$install_dir/.htconfig.php -cat ../conf/ldap_conf.php >> $install_dir/.htconfig.php -ynh_store_file_checksum --file=$install_dir/.htconfig.php - -chmod 600 "$install_dir/.htconfig.php" -chown $app:$app "$install_dir/.htconfig.php" +# chmod 600 "$install_dir/.htconfig.php" +# chown $app:$app "$install_dir/.htconfig.php" #================================================= # UPGRADE CRON JOB From 169fad561f0df34c5986cf9f095837d54d3b0b1c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 12 Jul 2023 14:19:26 +0000 Subject: [PATCH 2/8] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0b78745a..4645f09d 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -[Hubzilla](https://hub.libranet.de/directory?f=&global=1&pubforums=1) is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. What this all means for you: **less drama**. +Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. -**Shipped version:** 8.4.2~ynh1 +**Shipped version:** 8.6~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 87ae9768..56d3e828 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,10 +16,10 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -[Hubzilla](https://hub.libranet.de/directory?f=&global=1&pubforums=1) est une plate-forme de réseau social conçue avec le contrôle de votre vie privée au centre de la scène. Vos communications en ligne peuvent être aussi publiques que vous le souhaitez ou aussi privées que vous le souhaitez. Conversations privées, photos privées, vidéos privées. Votre média n'est pas caché derrière une URL obscure qui peut être devinée, il est protégé par une authentification interdomaine de pointe. Qu'est-ce que tout cela signifie pour vous : **moins de drames**. +Hubzilla est une plate-forme de réseau social conçue avec le contrôle de votre vie privée au centre de la scène. Vos communications en ligne peuvent être aussi publiques que vous le souhaitez ou aussi privées que vous le souhaitez. Conversations privées, photos privées, vidéos privées. Votre média n'est pas caché derrière une URL obscure qui peut être devinée, il est protégé par une authentification interdomaine de pointe. -**Version incluse :** 8.4.2~ynh1 +**Version incluse :** 8.6~ynh1 ## Captures d’écran From c30c3c5eb01cebfdc3a8c22ca84a6009af1665c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 13 Aug 2023 11:23:21 +0200 Subject: [PATCH 3/8] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8d017801..0046dc32 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,7 +15,7 @@ website = "https://zotlabs.org/page/hubzilla/hubzilla-project" code = "https://framagit.org/hubzilla/core" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://framagit.org/hubzilla/core/-/archive/8.6/core-8.6.tar.gz" - sha256 = "8fc7ea5ec0f1bea8c2047f6d44612d5246b78e6a40c1ad59f88641d1fef767b8" + url = "https://framagit.org/hubzilla/core/-/archive/8.6.1/core-8.6.1.tar.gz" + sha256 = "16c2d5426725ad82d8bdcbfcfdc9457d14f6c636bb521b61353566101412a96e" [resources.sources.addons] url = "https://framagit.org/hubzilla/addons/-/archive/8.4.1/addons-8.4.1.tar.gz" From 2a383abae32104ea4ec8f1f367bdcca56aa40925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 13 Aug 2023 11:42:52 +0200 Subject: [PATCH 4/8] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0046dc32..4c7a31d1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -27,7 +27,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.admin] type = "user" From bccff5a3cf0187047d8ac4b39897349288eaf965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 13 Aug 2023 11:43:05 +0200 Subject: [PATCH 5/8] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 4c7a31d1..57d7d32d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hubzilla" description.en = "Decentralized publication platform and social network" description.fr = "Plateforme de publication décentralisée et un réseau social" -version = "8.6~ynh1" +version = "8.6.1~ynh1" maintainers = ["Anmol Sharma"] From 59491f13fe2bbf751f25a63a2064c5f3106d109e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 13 Aug 2023 09:43:12 +0000 Subject: [PATCH 6/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4645f09d..0feba860 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. -**Shipped version:** 8.6~ynh1 +**Shipped version:** 8.6.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 56d3e828..2a8a316c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Hubzilla est une plate-forme de réseau social conçue avec le contrôle de votre vie privée au centre de la scène. Vos communications en ligne peuvent être aussi publiques que vous le souhaitez ou aussi privées que vous le souhaitez. Conversations privées, photos privées, vidéos privées. Votre média n'est pas caché derrière une URL obscure qui peut être devinée, il est protégé par une authentification interdomaine de pointe. -**Version incluse :** 8.6~ynh1 +**Version incluse :** 8.6.1~ynh1 ## Captures d’écran From 1dbfb2db5b44ff07232d2313587eb64a353db295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 13 Aug 2023 11:45:36 +0200 Subject: [PATCH 7/8] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 57d7d32d..fe01e67d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -45,8 +45,8 @@ ram.runtime = "50M" sha256 = "16c2d5426725ad82d8bdcbfcfdc9457d14f6c636bb521b61353566101412a96e" [resources.sources.addons] - url = "https://framagit.org/hubzilla/addons/-/archive/8.4.1/addons-8.4.1.tar.gz" - sha256 = "67f7b881f195b258c3d61922a6ce0f92832b907cafd5feb11b8abea4b2b055a0" + url = "https://framagit.org/hubzilla/addons/-/archive/8.6.1/addons-8.6.1.tar.gz" + sha256 = "6dad585ca61511043625b197c0d74e84a293c67f187bdf0d4752a5b88537d288" [resources.system_user] From 8ef1d2bb0d6baf587691ef6904194a7e5d6d00a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 13 Aug 2023 11:48:05 +0200 Subject: [PATCH 8/8] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index fe01e67d..617122a7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,7 +56,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-curl php8.2-gd php8.2-mysql php8.2-pgsql php8.2-mbstring php8.2-xml php8.2-zip php8.2-cli php8.2-imagick php8.2-json" + packages = "php8.2-curl php8.2-gd php8.2-mysql php8.2-pgsql php8.2-mbstring php8.2-xml php8.2-zip php8.2-cli php8.2-imagick" packages_from_raw_bash = """ if [[ "$database" == "mysql" ]]; then