diff --git a/conf/.env.production.sample b/conf/.env.production.sample index 21cc8e5..09be4c1 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -14,7 +14,8 @@ # ---------- # This identifies your server and cannot be changed safely later # ---------- -LOCAL_DOMAIN=__DOMAIN__ +LOCAL_DOMAIN=__LOCAL_DOMAIN__ +WEB_DOMAIN=__DOMAIN__ # Redis # ----- diff --git a/manifest.json b/manifest.json index 871809b..6f2ab8e 100644 --- a/manifest.json +++ b/manifest.json @@ -42,6 +42,14 @@ "name": "domain", "type": "domain" }, + { + "name": "local_domain", + "type": "domain", + "default": "", + "help": { + "en": "Use a different domain for users than the installation domain" + } + }, { "name": "is_public", "type": "boolean", diff --git a/scripts/install b/scripts/install index 6df1759..3152e38 100644 --- a/scripts/install +++ b/scripts/install @@ -26,6 +26,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN +local_domain=${YNH_APP_ARG_LOCAL_DOMAIN:=$YNH_APP_ARG_DOMAIN} path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE @@ -52,6 +53,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url 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=local_domain --value=$local_domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=admin --value=$admin diff --git a/scripts/remove b/scripts/remove index 69fc9ec..2ad4da3 100644 --- a/scripts/remove +++ b/scripts/remove @@ -19,6 +19,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +local_domain=$(ynh_app_setting_get --app=$app --key=local_domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$(ynh_app_setting_get --app=$app --key=db_user) final_path=$(ynh_app_setting_get --app=$app --key=final_path) diff --git a/scripts/restore b/scripts/restore index be0e019..29a4ece 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,6 +30,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +local_domain=$(ynh_app_setting_get --app=$app --key=local_domain) 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) diff --git a/scripts/upgrade b/scripts/upgrade index 9be5f2f..1f91c9e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,6 +19,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +local_domain=$(ynh_app_setting_get --app=$app --key=local_domain) path_url=$(ynh_app_setting_get --app=$app --key=path) language=$(ynh_app_setting_get --app=$app --key=language) admin=$(ynh_app_setting_get --app=$app --key=admin)