YunoHost-Apps/collabora_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/collabora_ynh.git synced 2024-09-03 18:16:25 +02:00
Code Issues Activity Actions

fix __NEXTCLOUDDOMAIN__

Browse source
This commit is contained in:
yalh76 2019-08-04 23:41:36 +02:00
parent adff77f4d0
commit c514722ec4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/loolwsd.xml
View file

@ -78,7 +78,7 @@
<storage desc="Backend storage">
<filesystem allow="false" />
<wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true">
<host desc="Regex pattern of hostname to allow or deny." allow="true">__NEXTCLOUDDOMAIN__</host>
<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>
@ -88,7 +88,7 @@
<max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
</wopi>
<webdav desc="Allow/deny webdav storage. Mutually exclusive with wopi." allow="false">
<host desc="Hostname to allow" allow="false">__NEXTCLOUDDOMAIN__</host>
<host desc="Hostname to allow" allow="false">__NEXTCLOUD_DOMAIN__</host>
</webdav>
</storage>

2
scripts/install
View file

@ -100,7 +100,7 @@ config="/etc/loolwsd/loolwsd.xml"
cp -f ../conf/loolwsd.xml $config
ynh_replace_string --match_string="__NEXTCLOUDDOMAIN__" --replace_string="$nextcloud_domain" --target_file="$config"
ynh_replace_string --match_string="__NEXTCLOUD_DOMAIN__" --replace_string="$nextcloud_domain" --target_file="$config"
ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$config"
#=================================================

4
scripts/upgrade
View file

@ -90,9 +90,9 @@ config="/etc/loolwsd/loolwsd.xml"
ynh_backup_if_checksum_is_different --file="$config"
cp -a ../conf/loolwsd.xml $config
cp -f ../conf/loolwsd.xml $config
ynh_replace_string "__NEXTCLOUDDOMAIN__" "$nextcloud_domain" "$config"
ynh_replace_string "__NEXTCLOUD_DOMAIN__" "$nextcloud_domain" "$config"
ynh_replace_string "__PASSWORD__" "$password" "$config"
# Recalculate and store the checksum of the file for the next upgrade.