From 332054d9e98ec23af47411186e281ead00e0ad6f Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Mon, 31 Jul 2023 17:38:28 +0200 Subject: [PATCH] Version update & removal of LDAP integration (code commented) --- manifest.toml | 6 +++--- scripts/install | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 54aafec..3dcb2fd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Streams" description.en = "An open source fediverse server" description.fr = "Un serveur fediverse open source" -version = "23.07.30~ynh1" +version = "23.07.31~ynh1" maintainers = ["Papa Dragon"] @@ -41,8 +41,8 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://codeberg.org/streams/streams/archive/b7db8b66261fa6a18dc59890d5461c2fb85242fa.tar.gz" - sha256 = "adf9e6a18cdea8df8dd22fb35afc201c2a8660327c055ef445fbae89190d8df1" + url = "https://codeberg.org/streams/streams/archive/2ae1943eb9c26b3c798d1c7289d356612c9b6644.tar.gz" + sha256 = "7a5f8ddc4d5dcf417e980103c5191bd8d899a96a2fa62cb13ed92bd216b30d25" [resources.sources.addons] url = "https://codeberg.org/streams/streams-addons/archive/0ff7cafbb205611c9f5fbbb8d8294c0b9dba0d70.tar.gz" diff --git a/scripts/install b/scripts/install index 6762a26..c654abb 100755 --- a/scripts/install +++ b/scripts/install @@ -114,9 +114,9 @@ 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..." +#ynh_script_progression --message="Push LDAP configuration to .htconfig.php..." -cat ../conf/ldap_conf.php >> $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" @@ -153,11 +153,11 @@ ynh_add_fail2ban_config --logpath="$install_dir/php.log" --failregex="^.*auth\.p #================================================= # LDAP ADDON ACTIVATION #================================================= -ynh_script_progression --message="Enabling ldapauth addon..." +#ynh_script_progression --message="Enabling ldapauth addon..." -pushd "$install_dir" - /usr/bin/php${YNH_PHP_VERSION} util/addons install ldapauth -popd +#pushd "$install_dir" +# /usr/bin/php${YNH_PHP_VERSION} util/addons install ldapauth +#popd #================================================= # END OF SCRIPT