From 9e024320eaed2e80ed4ee05b7e5a137a37eb616d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 22 Jun 2021 09:01:13 +0200 Subject: [PATCH 1/8] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index cb7fea4..e07feae 100644 --- a/scripts/install +++ b/scripts/install @@ -78,7 +78,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$final_path --source_id="$architecture" -mkdir "$final_path/.dispatch" chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" @@ -98,6 +97,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Modifying a config file..." --weight=1 +mkdir "$final_path/.dispatch" ynh_add_config --template="../conf/config.default.toml" --destination="$final_path/.dispatch/config.toml" #================================================= From 615d15131c35e2a14fcca803ff000a72ac3da51b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Jun 2021 15:09:35 +0200 Subject: [PATCH 2/8] Fix --- check_process | 2 +- scripts/install | 2 ++ scripts/restore | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 43e7848..a0a8c6f 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest domain="domain.tld" - path="/" + path="/path" is_public=1 ; Checks pkg_linter=1 diff --git a/scripts/install b/scripts/install index e07feae..a68cdf0 100644 --- a/scripts/install +++ b/scripts/install @@ -122,6 +122,8 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service ynh_systemd_action --service_name=$app --action=start --log_path="systemd" +sleep 60 + #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/restore b/scripts/restore index 103149e..23110a6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -45,7 +45,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" From 2e03bd33a749b62f60b06f888d12db571b1dbb79 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Jun 2021 18:45:06 +0200 Subject: [PATCH 3/8] Update install --- scripts/install | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index a68cdf0..572666c 100644 --- a/scripts/install +++ b/scripts/install @@ -78,6 +78,9 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$final_path --source_id="$architecture" +mkdir "$final_path/.dispatch" +ynh_add_config --template="../conf/config.default.toml" --destination="$final_path/.dispatch/config.toml" + chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" @@ -95,10 +98,10 @@ ynh_add_nginx_config #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_script_progression --message="Modifying a config file..." --weight=1 +# ynh_script_progression --message="Modifying a config file..." --weight=1 -mkdir "$final_path/.dispatch" -ynh_add_config --template="../conf/config.default.toml" --destination="$final_path/.dispatch/config.toml" +# mkdir "$final_path/.dispatch" +# ynh_add_config --template="../conf/config.default.toml" --destination="$final_path/.dispatch/config.toml" #================================================= # SETUP SYSTEMD @@ -122,7 +125,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service ynh_systemd_action --service_name=$app --action=start --log_path="systemd" -sleep 60 +#sleep 60 #================================================= # SETUP SSOWAT From 2dbfd29914a768652f9c08ab3fccd781936e0c0f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 8 Jul 2021 11:06:15 +0200 Subject: [PATCH 4/8] Update install --- scripts/install | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/install b/scripts/install index 572666c..982934a 100644 --- a/scripts/install +++ b/scripts/install @@ -93,16 +93,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=3 # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# SPECIFIC SETUP -#================================================= -# MODIFY A CONFIG FILE -#================================================= -# ynh_script_progression --message="Modifying a config file..." --weight=1 - -# mkdir "$final_path/.dispatch" -# ynh_add_config --template="../conf/config.default.toml" --destination="$final_path/.dispatch/config.toml" - #================================================= # SETUP SYSTEMD #================================================= From 880cf7e34785e9bccfdd32de8d74cf027cbd296b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Aug 2021 11:42:05 +0200 Subject: [PATCH 5/8] Fix --- conf/nginx.conf | 1 - conf/systemd.service | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 24edbcb..0119228 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -16,5 +16,4 @@ location / { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - } diff --git a/conf/systemd.service b/conf/systemd.service index dc1e7de..1bcd5fc 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,17 +1,13 @@ [Unit] Description=Dispatch IRC client -Wants=network-online.target -After=network-online.target +After=network.target [Service] Type=simple User=__APP__ -Group=nogroup +Group=__APP__ +WorkingDirectory=__FINALPATH__/ ExecStart=__FINALPATH__/dispatch -Restart=on-failure -RestartSec=5 -StartLimitInterval=60s -StartLimitBurst=3 [Install] -WantedBy=default.target +WantedBy=multi-user.target From 3eed27e51c480596b42469170f70a2b1723b768e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Aug 2021 11:48:11 +0200 Subject: [PATCH 6/8] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 23110a6..816553c 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 " From 73e1be36f69e5af6ba7f732747c13409a4e6e20a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Aug 2021 11:53:31 +0200 Subject: [PATCH 7/8] Create DESCRITION.md --- doc/DESCRITION.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/DESCRITION.md diff --git a/doc/DESCRITION.md b/doc/DESCRITION.md new file mode 100644 index 0000000..f3b4247 --- /dev/null +++ b/doc/DESCRITION.md @@ -0,0 +1,10 @@ +### Features + +- Searchable history +- Persistent connections +- Multiple servers and users +- Automatic HTTPS through Let's Encrypt +- Single binary with no dependencies +- DCC downloads +- SASL +- Client certificates From fb691fd5986adbd5a9e71279c7a19c6c54d35aa1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Aug 2021 12:56:01 +0200 Subject: [PATCH 8/8] Update check_process --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index a0a8c6f..2d042c8 100644 --- a/check_process +++ b/check_process @@ -11,6 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 + #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=0 change_url=1