1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lionwiki-t2t_ynh.git synced 2024-09-03 19:36:27 +02:00

Merge pull request #14 from YunoHost-Apps/fix

Fix
This commit is contained in:
farvardin 2021-12-04 14:40:33 +01:00 committed by GitHub
commit 4d510a59a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 32 deletions

View file

@ -182,22 +182,10 @@ ynh_store_file_checksum --file="$final_path/menu.php"
#=================================================
# Set permissions to app files
chown -R root: $final_path
# Wiki needs to write inside these folders. Make "Wiki" owner
chown -R $app:root $final_path/var
chown -R $app:root $final_path/templates
# write everything, even config files, for pheditor:
chown -R $app:root $final_path/
# Allow access to public assets like style sheets
find $final_path/templates -type f -print0 | xargs -0 chmod 0644
find $final_path/templates -type d -print0 | xargs -0 chmod 0755
find $final_path/templates/minimaxing/minimaxing.css -type f -print0 | xargs -0 chmod 0755
# Using "find" instead of "chmod -R 755" so files does not become executable too
# chmod : -rwxr-xr-x 1 root root 241 May 3 08:36 index.html => BAD
# find : -rw-r--r-- 1 1001 1002 241 May 3 08:36 index.html => GOOD
chown -R $app:www-data $final_path
chmod -R o-rwx $final_path
find $final_path -type d -exec chmod g=rx {} +
find $final_path -type f -exec chmod g=r {} +
#=================================================
# SETUP SSOWAT

View file

@ -68,7 +68,10 @@ ynh_system_user_create --username=$app
#=================================================
# Restore permissions on app files
chown -R root: $final_path
chown -R $app:www-data $final_path
chmod -R o-rwx $final_path
find $final_path -type d -exec chmod g=rx {} +
find $final_path -type f -exec chmod g=r {} +
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION

View file

@ -29,6 +29,20 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
upgrade_type=$(ynh_check_app_version_changed)
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=4
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
# restore it if the upgrade fails
ynh_restore_upgradebackup
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
@ -47,20 +61,6 @@ if ynh_legacy_permissions_exists; then
ynh_app_setting_delete --app=$app --key=is_public
fi
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=4
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
# restore it if the upgrade fails
ynh_restore_upgradebackup
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
@ -125,7 +125,10 @@ ynh_restore_file -o "conf/config.php"
#=================================================
# Set permissions on app files
chown -R root: $final_path
chown -R $app:www-data $final_path
chmod -R o-rwx $final_path
find $final_path -type d -exec chmod g=rx {} +
find $final_path -type f -exec chmod g=r {} +
#=================================================
# RELOAD NGINX