diff --git a/README.md b/README.md index 15ecdda..a502c56 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Kanboard is a free and open source Kanban project management software. ## Documentation and resources * Official app website: -* Official admin documentation: +* Official admin documentation: * Upstream app code repository: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 196ddb9..647559e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,7 +36,7 @@ Kanboard est un logiciel de gestion de projet Kanban gratuit et open source. ## Documentations et ressources * Site officiel de l’app : -* Documentation officielle de l’admin : +* Documentation officielle de l’admin : * Dépôt de code officiel de l’app : * Signaler un bug : diff --git a/conf/config.php b/conf/config.php index c242592..a47ee93 100644 --- a/conf/config.php +++ b/conf/config.php @@ -105,7 +105,7 @@ define('DB_ODBC_DSN', 'kanboard'); define('LDAP_AUTH', false); // LDAP server protocol, hostname and port URL (ldap[s]://hostname:port) -define('LDAP_SERVER', ''); +define('LDAP_SERVER', 'ldap://127.0.0.1:389'); // LDAP server port (389 by default) define('LDAP_PORT', 389); diff --git a/manifest.toml b/manifest.toml index dd073bd..f2ea236 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,8 +13,9 @@ maintainers = [] license = "MIT" website = "https://kanboard.net" demo = "https://demo.yunohost.org/kanboard/" -admindoc = "https://docs.kanboard.org/en/latest/" +admindoc = "https://docs.kanboard.org/" code = "https://github.com/kanboard/kanboard" +fund = "https://kanboard.org/#donations" [integration] yunohost = ">= 11.2" diff --git a/scripts/install b/scripts/install index d8f0461..e474cb8 100644 --- a/scripts/install +++ b/scripts/install @@ -13,7 +13,6 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -email=$(ynh_user_get_info --username=$admin --key=mail) fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" @@ -52,6 +51,13 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" + +# Create a dedicated Fail2Ban config +ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="^.*authentication failure\" while reading response header from upstream, client: ,.*$" --max_retry=5 + #================================================= # SPECIFIC SETUP #================================================= @@ -76,25 +82,6 @@ pushd $install_dir php$phpversion cli db:migrate --no-interaction --verbose popd -#================================================= -# SETUP CRON -#================================================= -ynh_script_progression --message="Setuping a cron..." --weight=1 - -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" -chown root: "/etc/cron.d/$app" -chmod 644 "/etc/cron.d/$app" - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP FAIL2BAN -#================================================= -ynh_script_progression --message="Configuring Fail2Ban..." --weight=10 - -# Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="^.*authentication failure\" while reading response header from upstream, client: ,.*$" --max_retry=5 - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index ab6d069..6a33e34 100644 --- a/scripts/restore +++ b/scripts/restore @@ -48,16 +48,13 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 -ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" -ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" -ynh_systemd_action --action=restart --service_name=fail2ban - ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" +ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" +ynh_systemd_action --action=restart --service_name=fail2ban ynh_restore_file --origin_path="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index eb2a5bd..701b8b9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,8 +97,6 @@ ynh_script_progression --message="Upgrading the app..." --weight=2 pushd $install_dir # Launch database migration php$phpversion cli db:migrate --no-interaction --verbose - # Launch plugins migration - php$phpversion cli plugin:upgrade --no-interaction --verbose popd #=================================================