diff --git a/scripts/_common.sh b/scripts/_common.sh index 72acb3f..f122fe2 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -17,11 +17,3 @@ go_version=1.20 #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -ynh_go_try_bash_extension() { - if [ -x src/configure ]; then - src/configure && make -C src || { - ynh_print_info --message="Optional bash extension failed to build, but things will still work normally." - } - fi -} diff --git a/scripts/backup b/scripts/backup index 2696784..c2cadee 100755 --- a/scripts/backup +++ b/scripts/backup @@ -28,15 +28,11 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="$data_dir" --is_big #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" ynh_backup --src_path="/etc/systemd/system/${app}_ldap.service" diff --git a/scripts/install b/scripts/install index 6d750bd..b0ea608 100755 --- a/scripts/install +++ b/scripts/install @@ -44,14 +44,6 @@ ynh_replace_string --match_string="
Galène
" - chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # SPECIFIC SETUP #================================================= @@ -120,17 +112,13 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1 public_ip4="$(curl -s ip.yunohost.org)" || true +# Create a dedicated NGINX config +ynh_add_nginx_config + # Create a dedicated systemd config ynh_add_systemd_config ynh_add_systemd_config --service=${app}_ldap --template="ldap.service" -#================================================= -# GENERIC FINALIZATION -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 - yunohost service add $app --description="Videoconferencing server" --needs_exposed_ports="$port_turn" yunohost service add ${app}_ldap --description="LDAP integration for the videoconferencing server" diff --git a/scripts/restore b/scripts/restore index 7296baa..9dbd5d9 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,10 +27,6 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1 ynh_restore_file --origin_path="$data_dir" --not_mandatory -mkdir -p $data_dir/{groups,recordings} - -chmod 750 "$data_dir" -chmod -R o-rwx "$data_dir" chown -R $app:www-data "$data_dir" #=================================================