1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/webtrees_ynh.git synced 2024-09-03 18:26:37 +02:00
* Update manifest.toml

* Auto-update README

* Upgrade Yunohost version (#84)

* Testing (#83)

* Update manifest.toml

* Auto-update README

---------

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* update package version to coordinate with upstream

---------

Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* Auto-update README

* Auto-update README

* fix

* fix

* Auto-update README

* cleaning

---------

Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: Thomas <51749973+Thovi98@users.noreply.github.com>
Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
This commit is contained in:
eric_G 2023-11-08 10:08:42 +01:00 committed by GitHub
parent 071dca6df6
commit 87c99665ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 11 deletions

View file

@ -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~ynh1
**Shipped version:** 2.1.18~ynh2
**Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo

View file

@ -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~ynh1
**Version incluse :** 2.1.18~ynh2
**Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo

View file

@ -1,3 +1,3 @@
INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__ADMIN_PASSWORD__');
INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__ADMIN_PASSWORD_HASHED__');
INSERT INTO `wt_user_setting` (`user_id`, `setting_name`, `setting_value`) VALUES ('1', 'canadmin', '1'), ('1', 'verified', '1'), ('1', 'verified_by_admin', '1');

View file

@ -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~ynh1"
version = "2.1.18~ynh2"
maintainers = []

View file

@ -45,17 +45,17 @@ ynh_script_progression --message="Configuring NGINX web server..."
ynh_add_nginx_config
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage=low --footprint=low
ynh_add_fpm_config
#=================================================
# MODIFY A CONFIG FILE
#=================================================
# Adding the details of the database to the config file
ynh_add_config --template="../conf/config.ini.php" --destination="$install_dir/data/config.ini.php"
ynh_add_config --template="config.ini.php" --destination="$install_dir/data/config.ini.php"
# Load initial SQL into the new database
ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/webtrees.sql"
# Replace variables in sql scripts
ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql"
@ -63,7 +63,7 @@ ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --ta
ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email" --target_file="../conf/sql/admin.sql"
ynh_replace_string --match_string="__ADMIN_PASSWORD_HASHED__" --replace_string="$admin_password_hashed" --target_file="../conf/sql/admin.sql"
ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/admin.sql"
#=================================================
# END OF SCRIPT

View file

@ -31,7 +31,6 @@ then
# 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}
@ -52,7 +51,7 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
ynh_add_nginx_config
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage=low --footprint=low
ynh_add_fpm_config
#=================================================
# END OF SCRIPT

View file

@ -14,4 +14,4 @@ test_format = 1.0
# Commits to test upgrade from
# -------------------------------
test_upgrade_from.dfcde24cce4db0527465acbc16dcecf9a3082858.name = "2.1.16"
#test_upgrade_from.dfcde24cce4db0527465acbc16dcecf9a3082858.name = "2.1.16"