mirror of
https://github.com/YunoHost-Apps/prowlarr_ynh.git
synced 2024-09-03 20:16:07 +02:00
Fix botched rebase
This commit is contained in:
parent
b91ccb7a61
commit
745a497cd1
3 changed files with 1 additions and 23 deletions
|
@ -68,8 +68,3 @@ ram.runtime = "50M"
|
|||
|
||||
[resources.apt]
|
||||
packages = "curl, mediainfo, sqlite3"
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> 64e384b (v2)
|
||||
|
|
|
@ -31,15 +31,7 @@ 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
|
||||
|
|
|
@ -10,15 +10,9 @@ source _common.sh
|
|||
source /usr/share/yunohost/helpers
|
||||
|
||||
#=================================================
|
||||
<<<<<<< HEAD
|
||||
# REMOVE SYSTEM CONFIGURATIONS
|
||||
#=================================================
|
||||
# REMOVE SYSTEMD SERVICE
|
||||
=======
|
||||
# STANDARD REMOVE
|
||||
#=================================================
|
||||
# REMOVE SERVICE INTEGRATION IN YUNOHOST
|
||||
>>>>>>> 64e384b (v2)
|
||||
# REMOVE SYSTEMD SERVICE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
|
||||
|
||||
|
@ -38,12 +32,9 @@ 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
|
||||
#=================================================
|
||||
|
|
Loading…
Add table
Reference in a new issue