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

This commit is contained in:
ericgaspar
2021-03-15 13:32:33 +01:00
8 changed files with 48 additions and 80 deletions

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