From 011f9ebad682a699a6bd1ccfd2b709f314306786 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Oct 2022 22:51:46 +0200 Subject: [PATCH] Remove curl --- conf/.env.example | 8 -------- manifest.json | 8 -------- scripts/backup | 2 +- scripts/install | 26 -------------------------- scripts/restore | 2 +- scripts/upgrade | 2 +- 6 files changed, 3 insertions(+), 45 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 1dde2ef..6f63bf9 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -27,14 +27,6 @@ database.default.username="__DB_USER__" database.default.password="__DB_PWD__" database.default.DBPrefix="cp_" -#-------------------------------------------------------------------- -# Email configuration -#-------------------------------------------------------------------- -# email.fromEmail="__EMAIL__" -# email.SMTPHost="loclhost" -# email.SMTPUser="" -# email.SMTPPass="" - #-------------------------------------------------------------------- # Cache configuration (advanced) # diff --git a/manifest.json b/manifest.json index 49eb107..6b719d1 100755 --- a/manifest.json +++ b/manifest.json @@ -39,10 +39,6 @@ "fr": "Castopod doit être installé dans un domaine ou sous-domaine dédié." } }, - { - "name": "admin", - "type": "user" - }, { "name": "is_public", "type": "boolean", @@ -51,10 +47,6 @@ "fr": "Si cette case est cochée, Castopod sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." }, "default": true - }, - { - "name": "password", - "type": "password" } ] } diff --git a/scripts/backup b/scripts/backup index e05640a..35163de 100755 --- a/scripts/backup +++ b/scripts/backup @@ -26,7 +26,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/install b/scripts/install index 3a8b0f4..4d0679a 100755 --- a/scripts/install +++ b/scripts/install @@ -27,9 +27,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -admin=$YNH_APP_ARG_ADMIN -password="$YNH_APP_ARG_PASSWORD" -email=$(ynh_user_get_info --username=$admin --key=mail) app=$YNH_APP_INSTANCE_NAME @@ -55,8 +52,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=password --value="$password" ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage @@ -141,27 +136,6 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" -#================================================= -# SETUP APPLICATION WITH CURL -#================================================= - -# # Set the app as temporarily public for curl call -# ynh_script_progression --message="Configuring SSOwat..." --weight=1 -# # Making the app public for curl -# ynh_permission_update --permission="main" --add="visitors" - -# # Reload NGINX -# ynh_systemd_action --service_name=nginx --action=reload - -# # Installation with curl -# ynh_script_progression --message="Finalizing installation..." --weight=1 - -# ynh_local_curl "/cp-install" - -# ynh_local_curl "/cp-install/create-superadmin" "email=$email" "username=$admin" "password=$password" - -# ynh_permission_update --permission="main" --remove="visitors" - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/restore b/scripts/restore index 10ac579..7a1bbd6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,7 +33,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) diff --git a/scripts/upgrade b/scripts/upgrade index 7b81dd2..d5355e8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint)