1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/wekan_ynh.git synced 2024-09-03 20:36:09 +02:00

Merge pull request #106 from YunoHost-Apps/fix

Fix
This commit is contained in:
yalh76 2020-12-25 18:53:41 +01:00 committed by GitHub
commit be698541e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 13 deletions

View file

@ -152,8 +152,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750
#================================================= #=================================================
ynh_script_progression --message="Integrating service in YunoHost..." ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description "Wekan daemon" --log_type "systemd" yunohost service add $app --description "Wekan daemon"
yunohost service add $mongodb_servicename --description "MongoDB daemon" --log "/var/log/mongodb/mongodb.log"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE

View file

@ -106,14 +106,14 @@ ynh_mongo_restore_db --database="$db_name" < ./dump.bson
ynh_script_progression --message="Restoring the systemd configuration..." ynh_script_progression --message="Restoring the systemd configuration..."
ynh_restore_file --origin_path="/etc/systemd/system/$app.service" ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
systemctl enable $app.service systemctl enable $app.service --quiet
#================================================= #=================================================
# INTEGRATE SERVICE IN YUNOHOST # INTEGRATE SERVICE IN YUNOHOST
#================================================= #=================================================
ynh_script_progression --message="Integrating service in YunoHost..." ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description "Wekan daemon" --log_type "systemd" yunohost service add $app --description "Wekan daemon"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE

View file

@ -69,13 +69,6 @@ ynh_clean_setup () {
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
#=================================================
# CHECK THE PATH
#=================================================
# Normalize the URL path syntax
path_url=$(ynh_normalize_url_path --path_url=$path_url)
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================
@ -98,7 +91,6 @@ fi
if ynh_version_gt "0.45-3" "${previous_version}" ; then if ynh_version_gt "0.45-3" "${previous_version}" ; then
ynh_script_progression --message="Upgrading to 0.45-3..." ynh_script_progression --message="Upgrading to 0.45-3..."
yunohost service add $app --description "Wekan daemon" --log_type "systemd"
fi fi
if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then
@ -109,7 +101,6 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then
rm -f /etc/apt/sources.list.d/mongodb-org-3.2.list rm -f /etc/apt/sources.list.d/mongodb-org-3.2.list
ynh_remove_app_dependencies ynh_remove_app_dependencies
ynh_install_app_dependencies "mongodb mongodb-server" ynh_install_app_dependencies "mongodb mongodb-server"
yunohost service add $app --description "Wekan daemon" --log_type "systemd"
fi fi
if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then
@ -219,6 +210,13 @@ chown -R $app: "$final_path"
chmod -R 640 "$final_path" chmod -R 640 "$final_path"
find "$final_path" -type d -print0 | xargs -0 chmod 750 find "$final_path" -type d -print0 | xargs -0 chmod 750
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description "Wekan daemon"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
#================================================= #=================================================