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

Merge pull request #94 from Lab-8916100448256/testing

Browse source 
various small fixes
This commit is contained in:
Florian 2024-06-14 14:19:52 +02:00 committed by GitHub
commit 353b9699f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/backup
View file

@ -43,7 +43,7 @@ ynh_backup --src_path="/etc/sudoers.d/$app"
# BACKUP THE IMPORTER PLUGIN POST APP INSTALL HOOK # BACKUP THE IMPORTER PLUGIN POST APP INSTALL HOOK
#================================================= #=================================================
ynh_backup --src_path="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh" ynh_backup --src_path="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
#================================================= #=================================================
# BACKUP THE MYSQL DATABASE # BACKUP THE MYSQL DATABASE

13
scripts/install
View file

@ -17,7 +17,7 @@ ynh_script_progression --message="Setting up source files..." --weight=5
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir"
chown -R $app:www-data $install_dir chown -R ${app}:www-data $install_dir
chmod -R u=rwX,g=rX,o-rwx $install_dir chmod -R u=rwX,g=rX,o-rwx $install_dir
#================================================= #=================================================
@ -92,6 +92,8 @@ ynh_setup_source --dest_dir="$install_dir/tools/yunohost" --source_id="yunohostp
# Add config at the end of wakka.config.php # Add config at the end of wakka.config.php
ynh_replace_string --match_string=");" --replace_string=" 'dataSources' => [\n'yunohost-cli' => [\n'formId' => '5', // form id used in local bazar\n'lang' => 'fr',\n'importer' => 'YunohostCLIApp', // importer class name (without Importer suffix)\n],\n],\n);" --target_file="$install_dir/wakka.config.php" ynh_replace_string --match_string=");" --replace_string=" 'dataSources' => [\n'yunohost-cli' => [\n'formId' => '5', // form id used in local bazar\n'lang' => 'fr',\n'importer' => 'YunohostCLIApp', // importer class name (without Importer suffix)\n],\n],\n);" --target_file="$install_dir/wakka.config.php"
SSO_DOMAIN=$(yunohost domain main-domain | sed -e 's/.*: //')
ynh_replace_string --match_string=");" --replace_string=" 'yunohost_sso_domain' => '${SSO_DOMAIN}',\n);" --target_file="$install_dir/wakka.config.php"
# Ensure that scripts are executable # Ensure that scripts are executable
chmod +x $install_dir/tools/yunohost/private/scripts/*.sh chmod +x $install_dir/tools/yunohost/private/scripts/*.sh
@ -101,9 +103,10 @@ ynh_add_config --template="sudoers" --destination="/etc/sudoers.d/$app"
chown root:root /etc/sudoers.d/$app chown root:root /etc/sudoers.d/$app
# Add a post app install hook to sync the app importer # Add a post app install hook to sync the app importer
ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh" mkdir -p /etc/yunohost/hooks.d/post_app_install
chown root:root /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
chmod +x /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh chown root:root /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
chmod +x /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
# At last, run the YunoHost app importer # At last, run the YunoHost app importer
ynh_script_progression --message="Import YunoHost apps in bazar" --weight=2 ynh_script_progression --message="Import YunoHost apps in bazar" --weight=2
@ -144,7 +147,7 @@ fi
# SECURE FILES AND DIRECTORIES # SECURE FILES AND DIRECTORIES
#================================================= #=================================================
chown -R $app:www-data $install_dir chown -R ${app}:www-data $install_dir
chmod -R u=rwX,g=rX,o-rwx $install_dir chmod -R u=rwX,g=rX,o-rwx $install_dir
chmod g-rwx $install_dir/wakka.config.php chmod g-rwx $install_dir/wakka.config.php

2
scripts/remove
View file

@ -24,7 +24,7 @@ ynh_remove_fpm_config
ynh_secure_remove --file="/etc/sudoers/$app" ynh_secure_remove --file="/etc/sudoers/$app"
# Remove post app install hook # Remove post app install hook
ynh_secure_remove --file="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh" ynh_secure_remove --file="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

2
scripts/restore
View file

@ -47,7 +47,7 @@ ynh_restore_file --origin_path="/etc/sudoers.d/$app"
#================================================= #=================================================
ynh_script_progression --message="Restoring the app importer post app install hook..." ynh_script_progression --message="Restoring the app importer post app install hook..."
ynh_restore_file --origin_path="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh" ynh_restore_file --origin_path="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
#================================================= #=================================================
# RESTORE THE MYSQL DATABASE # RESTORE THE MYSQL DATABASE

11
scripts/upgrade
View file

@ -35,7 +35,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]; then
fi fi
chmod -R o-rwx "$install_dir" chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir" chown -R ${app}:www-data "$install_dir"
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
@ -81,9 +81,10 @@ ynh_add_config --template="sudoers" --destination="/etc/sudoers.d/$app"
chown root:root /etc/sudoers.d/$app chown root:root /etc/sudoers.d/$app
# Add a post app install hook to sync the app importer # Add a post app install hook to sync the app importer
ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh" mkdir -p /etc/yunohost/hooks.d/post_app_install
chown root:root /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
chmod +x /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh chown root:root /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
chmod +x /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
# ToDo : Add importer config in wakka.config.php if it is not already there ? # ToDo : Add importer config in wakka.config.php if it is not already there ?
# if [ ??? ]; then # if [ ??? ]; then
@ -100,7 +101,7 @@ popd
# SECURE FILES AND DIRECTORIES # SECURE FILES AND DIRECTORIES
#================================================= #=================================================
chown -R $app:www-data $install_dir chown -R ${app}:www-data $install_dir
chmod -R u=rwX,g=rX,o-rwx $install_dir chmod -R u=rwX,g=rX,o-rwx $install_dir
chmod g-rwx $install_dir/wakka.config.php chmod g-rwx $install_dir/wakka.config.php