From 32f127855764838ce53bf3774a68108921428c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 10 Jun 2023 17:43:10 +0200 Subject: [PATCH] linter --- check_process | 21 ----------- doc/ADMIN.md | 4 +++ doc/DISCLAIMER.md | 6 ---- manifest.toml | 8 ++--- scripts/_common.sh | 4 +++ scripts/change_url | 90 +--------------------------------------------- tests.toml | 3 ++ 7 files changed, 16 insertions(+), 120 deletions(-) delete mode 100644 check_process create mode 100644 doc/ADMIN.md delete mode 100644 doc/DISCLAIMER.md create mode 100644 tests.toml diff --git a/check_process b/check_process deleted file mode 100644 index d05fe53..0000000 --- a/check_process +++ /dev/null @@ -1,21 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - language="fr" - admin="john" - password="1Strong-Password" - port="666" - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 diff --git a/doc/ADMIN.md b/doc/ADMIN.md new file mode 100644 index 0000000..0c6fa98 --- /dev/null +++ b/doc/ADMIN.md @@ -0,0 +1,4 @@ +* Email required for administation (uses "magic links" instead of admin passwords) + +* You should manually configure the app after installation. +* You should edit __INSTALL_DIR__/run_fider to add environment variables, e.g for GitHub integration diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index 4642af8..0000000 --- a/doc/DISCLAIMER.md +++ /dev/null @@ -1,6 +0,0 @@ -* Only installable on a domain root (or a subdomain root)! -* No Yunohost LDAP connection (yet) -* Email required for administation (uses "magic links" instead of admin passwords) - -* You should manually configure the app after installation. -* You should edit /var/www/fider/run_fider to add environment variables, e.g for Github integration diff --git a/manifest.toml b/manifest.toml index f2e2415..5c23c1d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,14 +17,14 @@ admindoc = "https://fider.io/docs" code = "https://github.com/getfider/fider" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.20" architectures = "all" multi_instance = true ldap = false sso = false -disk = "?" -ram.build = "20M" -ram.runtime = "?" +disk = "50MB" +ram.build = "20MB" +ram.runtime = "50MB" [install] [install.domain] diff --git a/scripts/_common.sh b/scripts/_common.sh index 541cacb..84c0610 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -46,3 +46,7 @@ install_golang_from_backports() { --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release)-backports main contrib non-free" \ --package="$pkg_dependency_golang" } + +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/change_url b/scripts/change_url index beca2a9..ae914ad 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,65 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -# Add settings here as needed by your application -secret=$(ynh_app_setting_get --app=$app --key=secret) -port=$(ynh_app_setting_get --app=$app --key=port) -db_user=$(ynh_app_setting_get --app=$app --key=db_user) -db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -82,29 +23,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi +ynh_change_url_nginx_config #================================================= # GENERIC FINALISATION @@ -115,13 +34,6 @@ 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" -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..cbbeef1 --- /dev/null +++ b/tests.toml @@ -0,0 +1,3 @@ +test_format = 1.0 + +[default]