From 67cc1343fc924f173e1aa1332e16b2930190011a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Aug 2021 14:24:54 +0200 Subject: [PATCH] Fix --- conf/config.conf.example | 6 +++--- doc/DESCRIPTION.md | 10 ++++++++++ scripts/install | 8 ++------ scripts/restore | 6 ++---- scripts/upgrade | 10 ++-------- 5 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/conf/config.conf.example b/conf/config.conf.example index 7613a69..81f760a 100644 --- a/conf/config.conf.example +++ b/conf/config.conf.example @@ -88,9 +88,9 @@ kiwiirc # Connections will be sent to a random upstream [upstream.1] -hostname = "chat.freenode.net" -port = 6667 -tls = false +hostname = "irc.libera.chat" +port = 6697 +tls = true # Connection timeout in seconds timeout = 5 # Throttle the lines being written by X per second diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..c6e5fe0 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,10 @@ +A versatile web based messenger using IRC + +###Features: + +- For single networks, bouncer hosts, or a personal generic IRC client that remembers your networks +- Works out of the box with a default IRC network - or use your own +- Single or multiple IRC network connections +- Light and dark modes +- Desktop notifications +- Extremely versatile via a single JSON config file at runtime diff --git a/scripts/install b/scripts/install index 46400fe..b454e28 100644 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ynh_clean_check_starting -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -116,7 +113,6 @@ ynh_add_systemd_config ynh_script_progression --message="Modifying a config file..." ynh_add_config --template="../conf/config.json.example" --destination="$final_path/static/config.json" - ynh_add_config --template="../conf/config.conf.example" --destination="$webircgateway_path/config.conf" #================================================= @@ -124,7 +120,7 @@ ynh_add_config --template="../conf/config.conf.example" --destination="$webircga #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A versatile web based messenger using IRC" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Versatile web based messenger using IRC" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -132,7 +128,7 @@ yunohost service add $app --description="A versatile web based messenger using I ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 66377ed..14fa6db 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -79,14 +77,14 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A versatile web based messenger using IRC" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Versatile web based messenger using IRC" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index af91fe2..cf1817a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,12 +47,6 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If final_path doesn't exist, create it -#if [ -z "$final_path" ]; then -# final_path=/var/www/$app -# ynh_app_setting_set --app=$app --key=final_path --value=$final_path -#fi - # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all @@ -112,7 +106,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A versatile web based messenger using IRC" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Versatile web based messenger using IRC" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -120,7 +114,7 @@ yunohost service add $app --description="A versatile web based messenger using I ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX