yeray/custom_nodejs_ynh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/testing' into eng-testing

Browse Source
This commit is contained in:
ericgaspar
2021-03-15 13:32:33 +01:00
parent 1723550d1d 8e17d517de
commit 91d0ba6c22
8 changed files with 48 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/change_url
View File

@@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..."
# Needed for helper "ynh_add_nginx_config"
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
port=$(ynh_app_setting_get --app=$app --key=port)
#=================================================

23
scripts/install
View File

@@ -135,23 +135,8 @@ ynh_add_systemd_config --others_var="ynh_node ynh_node_load_PATH"
#=================================================
ynh_script_progression --message="Modifying a config file..."
# config_file="$final_path/config.yml"
# cp -f ../conf/config.sample.yml $config_file
# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file"
# ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_file"
# ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config_file"
ynh_add_config --template="../conf/config.sample.yml" --destination="$final_path/config.yml"
#=================================================
# STORE THE CONFIG FILE CHECKSUM
#=================================================
ynh_script_progression --message="Storing the config file checksum..."
# Calculate and store the config file checksum into the app settings
ynh_store_file_checksum --file="$config_file"
#=================================================
# GENERIC FINALIZATION
#=================================================
@@ -200,12 +185,8 @@ ynh_systemd_action --service_name=nginx --action=reload
#=================================================
ynh_script_progression --message="Sending ReadMe to admin..."
ynh_replace_string --match_string="__LDAP_USER__" --replace_string="$ldap_user" --target_file="../conf/ldap_message"
ynh_replace_string --match_string="__LDAP_PASSWORD__" --replace_string="$ldap_password" --target_file="../conf/ldap_message"
ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/ldap_message"
ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="../conf/ldap_message"
ynh_send_readme_to_admin --app_message="../conf/ldap_message" --recipients="root" --type='install'
ynh_add_config --template="../conf/ldap_message" --destination="../conf/message_install"
ynh_send_readme_to_admin --app_message="../conf/message_install" --recipients="root" --type='install'
#=================================================
# END OF SCRIPT

2
scripts/remove
View File

@@ -32,7 +32,7 @@ ldap_user=$(ynh_app_setting_get --app=$app --key=ldap_user)
# Remove the service from the list of services known by Yunohost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null
then
ynh_script_progression --message="Removing $app service..."
ynh_script_progression --message="Removing $app service integration..."
yunohost service remove $app
fi

69
scripts/upgrade
View File

@@ -38,18 +38,6 @@ upgrade_type=$(ynh_check_app_version_changed)
#=================================================
ynh_script_progression --message="Ensuring downward compatibility..."
# If db_name doesn't exist, create it
if [ -z "$db_name" ]; then
db_name=$(ynh_sanitize_dbid --db_name=$app)
ynh_app_setting_set --app=$app --key=db_name --value=$db_name
fi
# If final_path doesn't exist, create it
if [ -z "$final_path" ]; then
final_path=/var/www/$app
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
fi
# If ldap_user doesn't exist, retrieve it or create it
if [[ -z "$ldap_user" ]]; then
ldap_user="svc_${app}_ldap"
@@ -79,6 +67,13 @@ ynh_psql_create_user $db_name $db_pwd
ynh_psql_test_if_first_run
ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name
# Cleaning legacy permissions
if ynh_legacy_permissions_exists; then
ynh_legacy_permissions_delete_all
ynh_app_setting_delete --app=$app --key=is_public
fi
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
@@ -86,14 +81,9 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
# Backup the current version of the app
ynh_backup_before_upgrade
#Workaround to be remove in next version
ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="HTTP Server:"
ynh_clean_setup () {
# restore it if the upgrade fails
# Restore it if the upgrade fails
ynh_restore_upgradebackup
ynh_clean_check_starting
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
@@ -119,24 +109,24 @@ then
tmpdir="$(mktemp -d)"
rsync -a "$config_file" "$tmpdir/."
if [ -d "$final_path/.ssh" ]; then
rsync -a "$final_path/.ssh" "$tmpdir/."
fi
if [ -d "$final_path/data" ]; then
rsync -a "$final_path/data" "$tmpdir/."
fi
if [ -d "$final_path/.ssh" ]; then
rsync -a "$final_path/.ssh" "$tmpdir/."
fi
if [ -d "$final_path/data" ]; then
rsync -a "$final_path/data" "$tmpdir/."
fi
ynh_secure_remove --file="$final_path"
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path"
rsync -a "$tmpdir/config.yml" "$final_path/."
if [ -d "$tmpdir/.ssh" ]; then
rsync -a "$tmpdir/.ssh" "$final_path/."
fi
if [ -d "$tmpdir/data" ]; then
rsync -a "$tmpdir/data" "$final_path/."
fi
if [ -d "$tmpdir/.ssh" ]; then
rsync -a "$tmpdir/.ssh" "$final_path/."
fi
if [ -d "$tmpdir/data" ]; then
rsync -a "$tmpdir/data" "$final_path/."
fi
fi
#=================================================
@@ -171,17 +161,6 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
#=================================================
ynh_script_progression --message="Modifying a config file..."
# config_file="$final_path/config.yml"
# ynh_backup_if_checksum_is_different --file=$config_file
# cp -f ../conf/config.sample.yml $config_file
# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_file"
# ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_file"
# ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config_file"
# # Recalculate and store the checksum of the file for the next upgrade.
# ynh_store_file_checksum --file="$config_file"
ynh_add_config --template="../conf/config.sample.yml" --destination="$final_path/config.yml"
#=================================================
@@ -228,12 +207,8 @@ ynh_systemd_action --service_name=nginx --action=reload
#=================================================
ynh_script_progression --message="Sending ReadMe to admin..."
ynh_replace_string --match_string="__LDAP_USER__" --replace_string="$ldap_user" --target_file="../conf/ldap_message"
ynh_replace_string --match_string="__LDAP_PASSWORD__" --replace_string="$ldap_password" --target_file="../conf/ldap_message"
ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/ldap_message"
ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="../conf/ldap_message"
ynh_send_readme_to_admin --app_message="../conf/ldap_message" --recipients="root" --type='upgrade'
ynh_add_config --template="../conf/ldap_message" --destination="../conf/message_upgrade"
ynh_send_readme_to_admin --app_message="../conf/message_upgrade" --recipients="root" --type='upgrade'
#=================================================
# END OF SCRIPT