mirror of
https://github.com/YunoHost-Apps/z-push_ynh.git
synced 2024-09-03 18:05:58 +02:00
revert back
This commit is contained in:
parent
7af62e9977
commit
b21fa89715
2 changed files with 17 additions and 36 deletions
|
@ -23,29 +23,16 @@
|
|||
"arguments": {
|
||||
"install" : [
|
||||
{
|
||||
"name": "domain_activesync",
|
||||
"name": "domain",
|
||||
"type": "domain",
|
||||
"ask": {
|
||||
"en": "Choose a domain for Z-push ActiveSync",
|
||||
"fr": "Choisissez un domaine pour Z-push ActiveSync"
|
||||
"en": "Choose a domain for Z-push",
|
||||
"fr": "Choisissez un domaine pour Z-push"
|
||||
},
|
||||
"example": "mail.example.com",
|
||||
"example": "example.com",
|
||||
"help": {
|
||||
"en": "Z-push ActiveSync will be available at domain/Microsoft-Server-ActiveSync.",
|
||||
"fr": "Z-push ActiveSync sera disponible à l'adresse domaine/Microsoft-Server-ActiveSync."
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "domain_autodiscover",
|
||||
"type": "domain",
|
||||
"ask": {
|
||||
"en": "Choose a domain for Z-push Autodiscover",
|
||||
"fr": "Choisissez un domaine pour Z-push Autodiscover"
|
||||
},
|
||||
"example": "autodiscover.example.com",
|
||||
"help": {
|
||||
"en": "Z-push Autodiscover will be available at domain/AutoDiscover/AutoDiscover.xml. Better to use autodiscover.example.org.",
|
||||
"fr": "Z-push Autodiscover sera disponible à l'adresse domaine/AutoDiscover/AutoDiscover.xml. Il est préférable d'utiliser le nom de domaine autodiscover.example.org."
|
||||
"en": "Z-push will be available at domain/Microsoft-Server-ActiveSync.",
|
||||
"fr": "Z-push sera disponible à l'adresse domaine/Microsoft-Server-ActiveSync."
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -24,17 +24,20 @@ ynh_abort_if_errors
|
|||
# RETRIEVE ARGUMENTS FROM THE MANIFEST
|
||||
#=================================================
|
||||
|
||||
domain_activesync=$YNH_APP_ARG_DOMAIN_ACTIVESYNC
|
||||
domain_autodiscover=$YNH_APP_ARG_DOMAIN_AUTODISCOVER
|
||||
path_url_activesync="/Microsoft-Server-ActiveSync"
|
||||
path_url_autodiscover1="/AutoDiscover"
|
||||
path_url_autodiscover2="/Autodiscover"
|
||||
path_url_autodiscover3="/autodiscover"
|
||||
domain=$YNH_APP_ARG_DOMAIN
|
||||
domain=$YNH_APP_ARG_DOMAIN
|
||||
path_url="/"
|
||||
#admin=$YNH_APP_ARG_ADMIN
|
||||
is_public="1"
|
||||
#language=$YNH_APP_ARG_LANGUAGE
|
||||
#password=$YNH_APP_ARG_PASSWORD
|
||||
|
||||
path_url_activesync="/Microsoft-Server-ActiveSync"
|
||||
path_url_autodiscover1="/AutoDiscover"
|
||||
path_url_autodiscover2="/Autodiscover"
|
||||
path_url_autodiscover3="/autodiscover"
|
||||
|
||||
|
||||
### If it's a multi-instance app, meaning it can be installed several times independently
|
||||
### The id of the app as stated in the manifest is available as $YNH_APP_ID
|
||||
### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...)
|
||||
|
@ -46,12 +49,6 @@ is_public="1"
|
|||
### guaranteed to be unique. This is a good unique identifier to define installation path,
|
||||
### db names, ...
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
app_activesync=$app
|
||||
app_autodiscover=$app
|
||||
|
||||
app_activesync+="_activesync"
|
||||
app_autodiscover+="_autodiscover"
|
||||
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
|
||||
|
@ -65,13 +62,10 @@ state_path=/var/lib/z-push
|
|||
#test ! -e "$final_path" || ynh_die "This path already contains a folder"
|
||||
|
||||
# Normalize the url path syntax
|
||||
#path_url=$(ynh_normalize_url_path $path_url)
|
||||
path_url=$(ynh_normalize_url_path $path_url)
|
||||
|
||||
# Register (book) web path
|
||||
ynh_webpath_register $app_activesync $domain_activesync $path_url_activesync
|
||||
ynh_webpath_register $app_autodiscover $domain_autodiscover $path_url_autodiscover1
|
||||
ynh_webpath_register $app_autodiscover $domain_autodiscover $path_url_autodiscover2
|
||||
ynh_webpath_register $app_autodiscover $domain_autodiscover $path_url_autodiscover3
|
||||
ynh_webpath_register $app $domain $path_url
|
||||
|
||||
#=================================================
|
||||
# STORE SETTINGS FROM MANIFEST
|
||||
|
|
Loading…
Add table
Reference in a new issue