diff --git a/README.md b/README.md index bf5b537..181dbf5 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Shipped version:** 2.1.18~ynh2 +**Shipped version:** 2.1.20~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 49fa689..f235a08 100644 --- a/README_es.md +++ b/README_es.md @@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Versión actual:** 2.1.18~ynh2 +**Versión actual:** 2.1.20~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index feb0cd1..493a838 100644 --- a/README_eu.md +++ b/README_eu.md @@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Paketatutako bertsioa:** 2.1.18~ynh2 +**Paketatutako bertsioa:** 2.1.20~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 8dc035b..90b3434 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s **Remarque :** Il est préférable de mettre à niveau à partir du panneau d'administration Webtrees lorsqu'une nouvelle version arrive. -**Version incluse :** 2.1.18~ynh2 +**Version incluse :** 2.1.20~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index f7d678c..5122a28 100644 --- a/README_gl.md +++ b/README_gl.md @@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Versión proporcionada:** 2.1.18~ynh2 +**Versión proporcionada:** 2.1.20~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 1e617ba..6c9ead5 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**分发版本：** 2.1.18~ynh2 +**分发版本：** 2.1.20~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 2bfc5be..0e278b1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Webtrees" description.en = "Web-based genealogy application" description.fr = "Logiciel libre de généalogie en ligne" -version = "2.1.18~ynh2" +version = "2.1.20~ynh1" maintainers = [] @@ -60,8 +60,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/fisharebest/webtrees/releases/download/2.1.18/webtrees-2.1.18.zip" - sha256 = "33808c8c39df9ff6120ddf55741638bb0287c6617527157abe8786aaa7c30ea2" + url = "https://github.com/fisharebest/webtrees/releases/download/2.1.20/webtrees-2.1.20.zip" + sha256 = "0e2f9ccf601e5d4579ef90d727b1630620bc22b9ef66c4aacbaf7329b3c7b49d" autoupdate.strategy = "latest_github_tag" autoupdate.asset = "*.zip" @@ -73,7 +73,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2-mbstring, php8.2-mysql, php8.2-zip, php8.2-gd, php8.2-xml, php8.2-curl, php8.2-intl, mailutils" + packages = "mariadb-server, php8.3-mbstring, php8.3-mysql, php8.3-zip, php8.3-gd, php8.3-xml, php8.3-curl, php8.3-intl, mailutils" [resources.database] type = "mysql" diff --git a/scripts/backup b/scripts/backup index eda99fe..9f67fa7 100755 --- a/scripts/backup +++ b/scripts/backup @@ -21,15 +21,11 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/restore b/scripts/restore index 3740315..ae3bef1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,6 +19,13 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +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 + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -28,13 +35,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -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 - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6cad7bc..a843cc3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # CHECK THE PATH #================================================= @@ -22,21 +16,8 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Upgrading source files..." -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." - # Move old app dir - #mv ${install_dir} ${install_dir}.old - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir=$install_dir --keep="data modules_v4" - - # restore data - #cp -a ${install_dir}.old/data ${install_dir} - - # delete temp directory - #ynh_secure_remove --file=${install_dir}.old -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir=$install_dir --keep="data modules_v4" chmod -R 700 $install_dir/data chmod -R o-rwx "$install_dir"