Add the ability to use collabora servers with extra WOPI hosts

conf/coolwsd.xml

@@ -189,14 +189,36 @@
     <storage desc="Backend storage">
         <filesystem allow="false" />
         <wopi desc="Allow/deny wopi storage." allow="true">
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">__NEXTCLOUD_DOMAIN__</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
-            <host desc="Regex pattern of hostname to allow or deny." allow="false">192\.168\.1\.1</host>
-
+            <alias_groups mode="groups">
+                <group>
+                        <host id="0" desc="Regex pattern of hostname to allow or deny." allow="true">__NEXTCLOUD_DOMAIN__</host>
+                </group>
+
+                <group>
+                        <host id="1" desc="Regex pattern of hostname to allow or deny." allow="true">__EXTRA_DOMAIN_1__</host>
+                </group>
+
+                <group>
+                        <host id="2" desc="Regex pattern of hostname to allow or deny." allow="true">__EXTRA_DOMAIN_2__</host>
+                </group>
+
+                <group>
+                        <host id="3" desc="Regex pattern of hostname to allow or deny." allow="true">__EXTRA_DOMAIN_3__</host>
+                </group>
+
+                <group>
+                        <host id="4" desc="Regex pattern of hostname to allow or deny." allow="true">__EXTRA_DOMAIN_4__</host>
+                </group>
+
+                <group>
+                    <host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+                    <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+                    <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+                    <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+                    <host desc="Regex pattern of hostname to allow or deny." allow="true">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
+                    <host desc="Regex pattern of hostname to allow or deny." allow="false">192\.168\.1\.1</host>
+                </group>
+        </alias_groups>
 
             <max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
 
@@ -235,7 +257,7 @@
     </quarantine_files>
 
     <remote_font_config>
-        <url desc="URL of optional JSON file that lists fonts to be included in Online" type="string" default="">https://__NEXTCLOUD_DOMAIN__/apps/richdocuments/settings/fonts.json</url>
+        <url desc="URL of optional JSON file that lists fonts to be included in Online" type="string" default="">https://__NEXTCLOUD_DOMAIN____PATH__/apps/richdocuments/settings/fonts.json</url>
     </remote_font_config>
 
 </config>

config_panel.toml

@@ -1,14 +1,60 @@
 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?"
     ask.fr = "Souhaitez-vous ajouter les polices non-libres de Microsoft® pour Collabora ?"
     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"

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 = [ ]
 

scripts/config

@@ -16,4 +16,46 @@ ynh_app_config_apply() {
    fi
 }
 
-ynh_app_config_run $1
+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:]]*\)<host id="0"[^>]*>[^<]*</host>' --replace="\1<host id=\"0\" desc=\"Regex pattern of hostname to allow or deny.\" allow=\"true\">$nextcloud_domain</host>" --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:]]*\)<host id="1"[^>]*>[^<]*</host>' --replace="\1<host id=\"1\" desc=\"Regex pattern of hostname to allow or deny.\" allow=\"true\">$extra_domain_1</host>" --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:]]*\)<host id="2"[^>]*>[^<]*</host>' --replace="\1<host id=\"2\" desc=\"Regex pattern of hostname to allow or deny.\" allow=\"true\">$extra_domain_2</host>" --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:]]*\)<host id="3"[^>]*>[^<]*</host>' --replace="\1<host id=\"3\" desc=\"Regex pattern of hostname to allow or deny.\" allow=\"true\">$extra_domain_3</host>" --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:]]*\)<host id="4"[^>]*>[^<]*</host>' --replace="\1<host id=\"4\" desc=\"Regex pattern of hostname to allow or deny.\" allow=\"true\">$extra_domain_4</host>" --file="/etc/coolwsd/coolwsd.xml"
+}
+
+ynh_app_config_run $1

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

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
 #=================================================