From 87ca90e94d07a27fa71eb6e1d130a1b5d84b34bd Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 11 Feb 2024 21:27:41 +0100 Subject: [PATCH 1/2] some cleanup --- scripts/backup | 4 ++-- scripts/install | 16 ++++++++-------- scripts/restore | 8 ++++---- scripts/upgrade | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scripts/backup b/scripts/backup index 597bead..ae1d9ef 100644 --- a/scripts/backup +++ b/scripts/backup @@ -15,9 +15,9 @@ source /usr/share/yunohost/helpers #================================================= ynh_print_info --message="Declaring files to be backed up..." -(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console.php maintenance 1) +(cd "$install_dir" && ynh_exec_as "$app" "php$phpversion" bin/console.php maintenance 1) -trap "(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console.php maintenance 0)" EXIT +trap '(cd $install_dir && ynh_exec_as $app php$phpversion bin/console.php maintenance 0)' EXIT #================================================= # BACKUP THE APP MAIN DIR diff --git a/scripts/install b/scripts/install index 1e64836..c270c7b 100644 --- a/scripts/install +++ b/scripts/install @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -email=$(ynh_user_get_info --username=$admin --key=mail) +email=$(ynh_user_get_info --username="$admin" --key=mail) timezone=$(cat /etc/timezone) #================================================= @@ -21,7 +21,7 @@ timezone=$(cat /etc/timezone) #================================================= ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=email --value=$email +ynh_app_setting_set --app="$app" --key=email --value="$email" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -36,7 +36,7 @@ mkdir -p "$install_dir/view/smarty3" chmod -R 775 "$install_dir/view/smarty3" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # SYSTEM CONFIGURATION @@ -49,7 +49,7 @@ ynh_add_fpm_config # Create a dedicated nginx config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -65,7 +65,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failreg ynh_script_progression --message="Adding the LDAP Auth addon configuration file..." --weight=1 # LDAP addon config -ynh_add_config --template="../conf/addon.config.php" --destination="$install_dir/config/addon.config.php" +ynh_add_config --template="addon.config.php" --destination="$install_dir/config/addon.config.php" #================================================= # INSTALL FRIENDICA @@ -74,15 +74,15 @@ ynh_script_progression --message="Install Friendica..." --weight=1 pushd "$install_dir" # Import Composer dependencies - ynh_exec_as "$app" php$phpversion bin/composer.phar install --no-dev --quiet + ynh_exec_as "$app" "php$phpversion" bin/composer.phar install --no-dev --quiet # Install application - ynh_exec_as "$app" php$phpversion bin/console.php autoinstall\ + ynh_exec_as "$app" "php$phpversion" bin/console.php autoinstall\ --dbhost "localhost" --dbdata "$db_name" --dbuser "$db_user" --dbpass "$db_pwd"\ --admin "$email" --tz "$timezone" --lang "$language" --url "https://$domain$path" # Enable LDAP Auth addon - ynh_exec_as "$app" php$phpversion bin/console.php addon enable ldapauth + ynh_exec_as "$app" "php$phpversion" bin/console.php addon enable ldapauth popd diff --git a/scripts/restore b/scripts/restore index 29f7215..496e7a4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" chmod -R 775 "$install_dir/view/smarty3" #================================================= @@ -25,7 +25,7 @@ chmod -R 775 "$install_dir/view/smarty3" #================================================= ynh_script_progression --message="Restoring the MySQL database..." --weight=1 -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql #================================================= # RESTORE SYSTEM CONFIGURATIONS @@ -53,7 +53,7 @@ ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload +ynh_systemd_action --service_name="php$phpversion-fpm" --action=reload ynh_systemd_action --service_name=nginx --action=reload @@ -62,7 +62,7 @@ ynh_systemd_action --service_name=nginx --action=reload #============== # exit maintenance mode since the app was backed up while in maintenance mode -(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/console.php maintenance 0) +(cd "$install_dir" && ynh_exec_as "$app" "php$phpversion" bin/console.php maintenance 0) #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index 534cdea..d5e7081 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -36,7 +36,7 @@ then fi chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS @@ -51,7 +51,7 @@ ynh_add_fpm_config ynh_use_logrotate --non-append -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -64,8 +64,8 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failreg # Run Composer pushd "$install_dir" - ynh_exec_as "$app" php$phpversion bin/composer.phar install --no-dev --quiet - ynh_exec_as "$app" php$phpversion bin/console.php dbstructure update + ynh_exec_as "$app" "php$phpversion" bin/composer.phar install --no-dev --quiet + ynh_exec_as "$app" "php$phpversion" bin/console.php dbstructure update popd #================================================= From b84945c5393cd835b10ad2138cd0778b8b626ba3 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 11 Feb 2024 21:28:01 +0100 Subject: [PATCH 2/2] add autoupdate for the addons --- manifest.toml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/manifest.toml b/manifest.toml index a9e635a..27e8d8c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Réseau social décentralisé" version = "2023.12~ynh1" -maintainers = [] +maintainers = [ "" ] [upstream] license = "AGPL-3.0-only" @@ -30,7 +30,7 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - + [install.init_main_permission] type = "group" default = "visitors" @@ -42,7 +42,7 @@ ram.runtime = "50M" ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" type = "select" - choices = ["de", "en", "es", "fr", "it", "pt"] + choices = [ "de", "en", "es", "fr", "it", "pt" ] default = "en" [resources] @@ -51,21 +51,23 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/friendica/friendica/archive/refs/tags/2023.12.tar.gz" sha256 = "d55475628ae24aab1ee7ed3367d22b2fd3ee49200b5da276c69e97df2afbd943" - autoupdate.strategy = "latest_github_tag" - + autoupdate.strategy = "latest_github_release" + [resources.sources.addons] url = "https://github.com/friendica/friendica-addons/archive/refs/tags/2023.12.tar.gz" sha256 = "d0228833584dd7dc0301ee04bd41728345c8051d84908849dea52ed04a7c8982" + autoupdate.upstream = "https://github.com/friendica/friendica-addons" + autoupdate.strategy = "latest_github_tag" - [resources.system_user] +[resources.system_user] - [resources.install_dir] +[resources.install_dir] - [resources.permissions] - main.url = "/" +[resources.permissions] +main.url = "/" - [resources.apt] - packages = "mariadb-server, php8.2-curl, php8.2-mbstring, php8.2-imagick, php8.2-xml, php8.2-zip, php8.2-mysql, php8.2-gd, php8.2-gmp" +[resources.apt] +packages = "mariadb-server, php8.2-curl, php8.2-mbstring, php8.2-imagick, php8.2-xml, php8.2-zip, php8.2-mysql, php8.2-gd, php8.2-gmp" - [resources.database] - type = "mysql" +[resources.database] +type = "mysql"