diff --git a/check_process b/check_process index 28236c8..a94739b 100644 --- a/check_process +++ b/check_process @@ -1,11 +1,11 @@ ;; Test complet ; Manifest domain="domain.tld" - path="/" + path="/path" is_public=1 ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 setup_private=1 @@ -14,7 +14,7 @@ #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - change_url=0 + change_url=1 ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index 3b0a094..5e3b07a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Matrix client focusing primarily on simple, elegant and secure interface", "fr": "Client matrix orienté simplicité, élégance et sécurité" }, - "version": "1.5.0~ynh1", + "version": "1.5.0~ynh2", "url": "https://cinny.in", "upstream": { "license": "MIT", @@ -37,12 +37,8 @@ { "name": "path", "type": "path", - "example": "/", - "default": "/", - "help": { - "en": "Cinny only supports to be installed on / for now.", - "fr": "Cinny ne peut être installé que à la racine pour le moment." - } + "example": "/cinny", + "default": "/cinny" }, { "name": "is_public", diff --git a/scripts/_common.sh b/scripts/_common.sh index 7915d33..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,14 +8,6 @@ # PERSONAL HELPERS #================================================= -ynh_webpath_is_domain_root () { - local -A args_array=( [p]=path_url= ) - local path_url - ynh_handle_getopts_args "$@" - - [[ "$path_url" != "/" ]] && [[ "$path_url" != "" ]] -} - #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/change_url b/scripts/change_url index 43c7b65..1c9d1c3 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -62,12 +62,6 @@ then change_path=1 fi - -if ynh_webpath_is_domain_root -p "$new_path"; then - ynh_print_err "Cinny can only be installed on a domain root !" - ynh_die "Aborting." -fi - #================================================= # STANDARD MODIFICATIONS #================================================= diff --git a/scripts/install b/scripts/install index f6f9837..6f888ef 100755 --- a/scripts/install +++ b/scripts/install @@ -36,11 +36,6 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde # Register (book) web path -if ynh_webpath_is_domain_root -p "$path_url"; then - ynh_print_err "Cinny can only be installed on a domain root !" - ynh_die "Aborting." -fi - ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #=================================================