From 9e95d4ed9c00ca4ac9510694fdec46fd82332a9a Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Sun, 5 Nov 2023 21:47:17 +0100 Subject: [PATCH 1/4] Remove remaining ldapauth code from install and upgrade scripts --- conf/ldap_conf.php | 7 ------- scripts/install | 9 --------- scripts/upgrade | 6 ------ 3 files changed, 22 deletions(-) delete mode 100644 conf/ldap_conf.php diff --git a/conf/ldap_conf.php b/conf/ldap_conf.php deleted file mode 100644 index a4688d6..0000000 --- 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 9d2a444..01fc235 100755 --- a/scripts/install +++ b/scripts/install @@ -128,15 +128,6 @@ ynh_script_progression --message="Configuring Fail2Ban..." --weight=1 # Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="$install_dir/php.log" --failregex="^.*auth\.php.*failed login attempt.*from IP .*$" --max_retry="5" -#================================================= -# LDAP ADDON ACTIVATION -#================================================= -#ynh_script_progression --message="Enabling ldapauth addon..." - -#pushd "$install_dir" -# /usr/bin/php${YNH_PHP_VERSION} util/addons install ldapauth -#popd - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d4d81a3..fbb37d4 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,12 +94,6 @@ ynh_script_progression --message="Updating 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" chown $app:$app "$install_dir/.htconfig.php" From 7b002bbf124f937a6baeeef244c23e6e20bfe040 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Sun, 5 Nov 2023 21:49:05 +0100 Subject: [PATCH 2/4] Change version, just to make things in a clean way --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ce3871a..157e509 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Streams" description.en = "Open source fediverse server" description.fr = "Serveur fediverse open source" -version = "23.11.05~ynh2" +version = "23.11.05~ynh3" maintainers = ["Papa Dragon"] From 408e5f5ae48239f3506a9da14f1c4b17ae7414e2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 5 Nov 2023 20:49:38 +0000 Subject: [PATCH 3/4] 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 8e68f1f..69bb7dd 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The [streams repository](https://codeberg.org/streams/streams/) lets you install Your websites will be compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. -**Shipped version:** 23.11.05~ynh2 +**Shipped version:** 23.11.05~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index affe6e4..02056d3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Le [dépôt streams](https://codeberg.org/streams/streams/) vous permet d'instal Vos sites web seront compatibles avec **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** et bien d'autres encore. -**Version incluse :** 23.11.05~ynh2 +**Version incluse :** 23.11.05~ynh3 ## Captures d’écran From 5112b799be49c5768416ca8c23efd0afbba9cfb5 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Sun, 5 Nov 2023 21:55:05 +0100 Subject: [PATCH 4/4] We bring back testing upgrade from previous package versions --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 890a1e5..04c735d 100644 --- a/tests.toml +++ b/tests.toml @@ -13,5 +13,5 @@ test_format = 1.0 # Default args to use for install # ------------------------------- -# test_upgrade_from.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.name = "Upgrade from xx.xx.xx~ynhx" + test_upgrade_from.8985f0af2e713f8fc514dcf4b42208d1329f2403.name = "Upgrade from 23.11.05~ynh2"