diff --git a/conf/coolwsd.xml b/conf/coolwsd.xml index 8712589..16606f1 100644 --- a/conf/coolwsd.xml +++ b/conf/coolwsd.xml @@ -189,14 +189,36 @@ - __NEXTCLOUD_DOMAIN__ - 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} - 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} - 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} - 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} - 192\.168\.[0-9]{1,3}\.[0-9]{1,3} - 192\.168\.1\.1 - + + + __NEXTCLOUD_DOMAIN__ + + + + __EXTRA_DOMAIN_1__ + + + + __EXTRA_DOMAIN_2__ + + + + __EXTRA_DOMAIN_3__ + + + + __EXTRA_DOMAIN_4__ + + + + 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 192\.168\.1\.1 + + 0 @@ -235,7 +257,7 @@ - https://__NEXTCLOUD_DOMAIN__/apps/richdocuments/settings/fonts.json + https://__NEXTCLOUD_DOMAIN____PATH__/apps/richdocuments/settings/fonts.json diff --git a/config_panel.toml b/config_panel.toml index b576ea3..074d70e 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,10 +1,13 @@ version = "1.0" [main] -name.en = "MS fonts" -name.fr = "MS fonts" +name.en = "Configuration panel" +name.fr = "Panneau de configuration" +services = ["coolwsd"] [main.msfonts] + name.en = "MS fonts" + name.fr = "MS fonts" [main.msfonts.msfonts_enabled] ask.en = "Would you like to add the non-free Microsoft® fonts for Collabora?" @@ -12,3 +15,46 @@ name.fr = "MS fonts" type = "boolean" yes = "true" no = "false" + + [main.add_domains] + name.en = "WOPI Hosts" + name.fr = "Hôtes WOPI" + + [main.add_domains.nextcloud_domain] + ask.fr = "Domaine nextcloud actuel" + ask.en = "Current nextcloud domain" + default = "" + type = "string" + bind = "null" + + [main.add_domains.extra_domain_1] + ask.fr = "Premier domaine supplémentaire" + ask.en = "First extra domain" + type = "string" + example = "nextcloud.example.com" + default = "" + bind = "null" + + [main.add_domains.extra_domain_2] + ask.fr = "Deuxième domaine supplémentaire" + ask.en = "Second extra domain" + type = "string" + example = "nextcloud.example.com" + default = "" + bind = "null" + + [main.add_domains.extra_domain_3] + ask.fr = "Troisième domaine supplémentaire" + ask.en = "Third extra domain" + type = "string" + example = "nextcloud.example.com" + default = "" + bind = "null" + + [main.add_domains.extra_domain_4] + ask.fr = "Quatrième domaine supplémentaire" + ask.en = "Fourth extra domain" + type = "string" + example = "nextcloud.example.com" + default = "" + bind = "null" diff --git a/manifest.toml b/manifest.toml index d4312fe..a834f40 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Collabora Online" description.en = "Online office suite with collaborative editing" description.fr = "Suite office en ligne et collaborative" -version = "25.04.10.3~ynh1" +version = "25.04.9.1~ynh3" maintainers = [ ] diff --git a/scripts/config b/scripts/config index cd08e7b..a44d848 100644 --- a/scripts/config +++ b/scripts/config @@ -16,4 +16,46 @@ ynh_app_config_apply() { fi } -ynh_app_config_run $1 \ No newline at end of file +get__nextcloud_domain() { +ynh_app_setting_get --key=nextcloud_domain +} +get__extra_domain_1() { +ynh_app_setting_get --key=extra_domain_1 +} +get__extra_domain_2() { +ynh_app_setting_get --key=extra_domain_2 +} +get__extra_domain_3() { +ynh_app_setting_get --key=extra_domain_3 +} +get__extra_domain_4() { +ynh_app_setting_get --key=extra_domain_4 +} + + +set__nextcloud_domain() { +ynh_app_setting_set --key=nextcloud_domain --value=$nextcloud_domain +ynh_replace --match='^\([[:space:]]*\)]*>[^<]*' --replace="\1$nextcloud_domain" --file="/etc/coolwsd/coolwsd.xml" +} + +set__extra_domain_1() { +ynh_app_setting_set --key=extra_domain_1 --value=$extra_domain_1 +ynh_replace --match='^\([[:space:]]*\)]*>[^<]*' --replace="\1$extra_domain_1" --file="/etc/coolwsd/coolwsd.xml" +} + +set__extra_domain_2() { +ynh_app_setting_set --key=extra_domain_2 --value=$extra_domain_2 +ynh_replace --match='^\([[:space:]]*\)]*>[^<]*' --replace="\1$extra_domain_2" --file="/etc/coolwsd/coolwsd.xml" +} + +set__extra_domain_3() { +ynh_app_setting_set --key=extra_domain_3 --value=$extra_domain_3 +ynh_replace --match='^\([[:space:]]*\)]*>[^<]*' --replace="\1$extra_domain_3" --file="/etc/coolwsd/coolwsd.xml" +} + +set__extra_domain_4() { +ynh_app_setting_set --key=extra_domain_4 --value=$extra_domain_4 +ynh_replace --match='^\([[:space:]]*\)]*>[^<]*' --replace="\1$extra_domain_4" --file="/etc/coolwsd/coolwsd.xml" +} + +ynh_app_config_run $1 diff --git a/scripts/install b/scripts/install index 9b2af2a..5ed4f2d 100644 --- a/scripts/install +++ b/scripts/install @@ -13,6 +13,10 @@ source /usr/share/yunohost/helpers ynh_app_setting_set --key=password --value="$password" ynh_app_setting_set --key=protect_against_basic_auth_spoofing --value=false +ynh_app_setting_set_default --key=extra_domain_1 --value="" +ynh_app_setting_set_default --key=extra_domain_2 --value="" +ynh_app_setting_set_default --key=extra_domain_3 --value="" +ynh_app_setting_set_default --key=extra_domain_4 --value="" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE diff --git a/scripts/upgrade b/scripts/upgrade index ba547ca..7feef1f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,6 +40,11 @@ if [ -z "${msfonts_enabled:-}" ]; then ynh_app_setting_set_default --key="msfonts_enabled" --value="false" fi +ynh_app_setting_set_default --key=extra_domain_1 --value="" +ynh_app_setting_set_default --key=extra_domain_2 --value="" +ynh_app_setting_set_default --key=extra_domain_3 --value="" +ynh_app_setting_set_default --key=extra_domain_4 --value="" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================