From b91ccb7a618f24c9dcd4a67cfb72ed496f417124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 18 Nov 2023 18:18:03 +0100
Subject: [PATCH] v2

---
 manifest.toml      | 4 ++++
 scripts/change_url | 8 ++++++++
 scripts/remove     | 9 +++++++++
 3 files changed, 21 insertions(+)

diff --git a/manifest.toml b/manifest.toml
index f8125de..d90779b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -68,4 +68,8 @@ ram.runtime = "50M"
 
     [resources.apt]
     packages = "curl, mediainfo, sqlite3"
+<<<<<<< HEAD
     
+=======
+    
+>>>>>>> 64e384b (v2)
diff --git a/scripts/change_url b/scripts/change_url
index 31c6be8..1abcb0a 100755
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -31,7 +31,15 @@ ynh_change_url_nginx_config
 # UPDATE CONFIGURATION FILE
 #=================================================
 
+<<<<<<< HEAD
 ynh_replace_string --match_string="<UrlBase>$old_path</UrlBase>" --replace_string="<UrlBase>$new_path</UrlBase>" --target_file="$data_dir/config.xml"
+=======
+ynh_exec_warn_less 'ynh_add_config --template="config.xml" --destination="$data_dir/config.xml"'
+
+chmod 750 "$data_dir/config.xml"
+chmod o-rwx "$data_dir/config.xml"
+chown $app "$data_dir/config.xml"
+>>>>>>> 64e384b (v2)
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/remove b/scripts/remove
index d9cee11..74439e0 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,9 +10,15 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
+<<<<<<< HEAD
 # REMOVE SYSTEM CONFIGURATIONS
 #=================================================
 # REMOVE SYSTEMD SERVICE 
+=======
+# STANDARD REMOVE
+#=================================================
+# REMOVE SERVICE INTEGRATION IN YUNOHOST
+>>>>>>> 64e384b (v2)
 #=================================================
 ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
@@ -32,9 +38,12 @@ ynh_remove_nginx_config
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
+<<<<<<< HEAD
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 
+=======
+>>>>>>> 64e384b (v2)
 #=================================================
 # END OF SCRIPT
 #=================================================