From 33475405070eb9c470920865df07ff1e829d13eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:07:19 +0200 Subject: [PATCH] fix --- manifest.toml | 2 +- scripts/install | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/manifest.toml b/manifest.toml index c96a0f0..8c223c9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://github.com/ssb-ngi-pointer/go-ssb-room/blob/master/README.md" code = "https://github.com/ssb-ngi-pointer/go-ssb-room" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = ["amd64", "arm64", "armhf"] multi_instance = true ldap = false diff --git a/scripts/install b/scripts/install index d0b1e5e..16f881e 100755 --- a/scripts/install +++ b/scripts/install @@ -20,14 +20,6 @@ ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # BUILD APP #================================================= @@ -40,6 +32,8 @@ pushd $install_dir ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/ popd +chmod +x "$install_dir/server" + #================================================= # CREATE FIRST ADMIN USER #================================================= @@ -62,24 +56,15 @@ EOF #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 +# Create a dedicated NGINX config +ynh_add_nginx_config + # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." --weight=1 - # Use logrotate to manage application logfile(s) ynh_use_logrotate -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="Secure Scuttlebutt room server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port_ssb #=================================================