diff --git a/check_process b/check_process index 43e7848..2d042c8 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 @@ -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 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 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 diff --git a/scripts/install b/scripts/install index cb7fea4..982934a 100644 --- a/scripts/install +++ b/scripts/install @@ -79,6 +79,8 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path 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" @@ -91,15 +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 - -ynh_add_config --template="../conf/config.default.toml" --destination="$final_path/.dispatch/config.toml" - #================================================= # SETUP SYSTEMD #================================================= @@ -122,6 +115,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..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 " @@ -45,7 +43,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"