From b411e03a6a223ff884913f20082dd5083ba6a5ee Mon Sep 17 00:00:00 2001 From: farvardin Date: Fri, 27 Mar 2020 09:49:21 +0100 Subject: [PATCH] maj --- README.md | 19 +++++++++---------- conf/app.src | 2 +- scripts/backup | 6 +++--- scripts/remove | 4 ++-- scripts/restore | 8 ++++---- scripts/upgrade | 4 ++-- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 75d0ebc..bb9f5ab 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,13 @@ -yunohost for lionwiki-t2t -# Usage of this package (REMOVE THIS SECTION BEFORE RELEASE) -- Copy this app before working on it. -- Edit `conf/nginx.conf` file to match application prerequisites. -- Edit `manifest.json` with application specific information. -- Edit the `install`, `upgrade`, `remove`, `backup`, and `restore` scripts. - - Using the [script helpers documentation.](https://helpers.yunohost.org/) -- Add a `LICENSE` file for the package. -- Edit `README.md` and README_fr.md. +# Lionwiki-t2t for YunoHost + + +## Todo: to package it correctly: https://yunohost.org/#/packaging_apps_fr + + +# Usage of this package + # Example app for YunoHost @@ -17,7 +16,7 @@ yunohost for lionwiki-t2t *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install REPLACEBYYOURAPP quickly and simply on a YunoHost server. +> *This package allow you to install Lionwiki-t2t quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview diff --git a/conf/app.src b/conf/app.src index 0df79b6..efc4d34 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://sourceforge.net/projects/lionwiki-t2t/files/lionwiki-t2t.zip -SOURCE_SUM=4a34b9b9f4c31714096a250b45988e8d1d3c58f49776a735eedd83f6694d24c3 +SOURCE_SUM=7512d7a35e846f19fbce6a3276594f37afba746db513a25378f1460d4d52c30a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/scripts/backup b/scripts/backup index a532136..b7ec1b7 100644 --- a/scripts/backup +++ b/scripts/backup @@ -70,10 +70,10 @@ ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf" #================================================= # BACKUP FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Backing up fail2ban configuration..." --time --weight=1 +#ynh_script_progression --message="Backing up fail2ban configuration..." --time --weight=1 -ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" -ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" +#ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" +#ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" #================================================= diff --git a/scripts/remove b/scripts/remove index db74917..7c5e20a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -65,10 +65,10 @@ fi #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Removing fail2ban configuration..." --time --weight=1 +#ynh_script_progression --message="Removing fail2ban configuration..." --time --weight=1 # Remove the dedicated fail2ban config -ynh_remove_fail2ban_config +#ynh_remove_fail2ban_config #================================================= diff --git a/scripts/restore b/scripts/restore index a153a70..906ffcf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -83,11 +83,11 @@ ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf" #================================================= # RESTORE FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the fail2ban configuration..." --time --weight=1 +#ynh_script_progression --message="Restoring the fail2ban configuration..." --time --weight=1 -ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" -ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" -ynh_systemd_action --action=restart --service_name=fail2ban +#ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" +#ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" +#ynh_systemd_action --action=restart --service_name=fail2ban #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 243e85b..5811bd4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -177,10 +177,10 @@ ynh_add_systemd_config #================================================= # UPGRADE FAIL2BAN #================================================= -ynh_script_progression --message="Reconfiguring fail2ban..." --time --weight=1 +#ynh_script_progression --message="Reconfiguring fail2ban..." --time --weight=1 # Create a dedicated fail2ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" +#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" #================================================= # SECURE FILES AND DIRECTORIES