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

Merge pull request #81 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Alexandre Aubin 2023-08-21 16:19:32 +02:00 committed by GitHub
commit 1e788b9a9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 19 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
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. **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.
**Shipped version:** 2.1.16~ynh2 **Shipped version:** 2.1.17~ynh1
**Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo **Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo

2
README_fr.md
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. **Remarque :** Il est préférable de mettre à niveau à partir du panneau d'administration Webtrees lorsqu'une nouvelle version arrive.
**Version incluse :** 2.1.16~ynh2 **Version incluse :** 2.1.17~ynh1
**Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo **Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo

2
conf/sql/admin.sql
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__', '__PASSWORD__'); 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_setting` (`user_id`, `setting_name`, `setting_value`) VALUES ('1', 'canadmin', '1'), ('1', 'verified', '1'), ('1', 'verified_by_admin', '1'); INSERT INTO `wt_user_setting` (`user_id`, `setting_name`, `setting_value`) VALUES ('1', 'canadmin', '1'), ('1', 'verified', '1'), ('1', 'verified_by_admin', '1');

2
doc/POST_INSTALL.md
View file

@ -1,4 +1,4 @@
Your credentials for the admin panel are: Your credentials for the admin panel are:
- admin username: __ADMIN_USERNAME__ - admin username: __ADMIN_USERNAME__
- admin password: __PASSWORD__ - admin password: __ADMIN_PASSWORD__

2
doc/POST_INSTALL_fr.md
View file

@ -1,4 +1,4 @@
Vos informations d'identification pour le panneau d'administration sont : Vos informations d'identification pour le panneau d'administration sont :
- nom d'utilisateur administrateur : __ADMIN_USERNAME__ - nom d'utilisateur administrateur : __ADMIN_USERNAME__
- mot de passe administrateur : __PASSWORD__ - mot de passe administrateur : __ADMIN_PASSWORD__

10
manifest.toml
View file

@ -5,9 +5,9 @@ name = "Webtrees"
description.en = "Web-based genealogy application" description.en = "Web-based genealogy application"
description.fr = "Logiciel libre de généalogie en ligne" description.fr = "Logiciel libre de généalogie en ligne"
version = "2.1.16~ynh2" version = "2.1.17~ynh1"
maintainers = ["Anmol Sharma"] maintainers = []
[upstream] [upstream]
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
@ -17,7 +17,7 @@ admindoc = "https://wiki.webtrees.net"
code = "https://github.com/fisharebest/webtrees" code = "https://github.com/fisharebest/webtrees"
[integration] [integration]
yunohost = ">= 11.1.19" yunohost = ">= 11.2"
architectures = "all" architectures = "all"
multi_instance = true multi_instance = true
ldap = false ldap = false
@ -60,8 +60,8 @@ ram.runtime = "50M"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/fisharebest/webtrees/releases/download/2.1.16/webtrees-2.1.16.zip" url = "https://github.com/fisharebest/webtrees/releases/download/2.1.17/webtrees-2.1.17.zip"
sha256 = "3b5dc78b4a2abac37eebb8fca0bb1a21339ad1316ca5d269083725ba92ffaf54" sha256 = "91599632d1887d268f3ea7ce549138db508aca84b60d0c74106b6968be00b381"
autoupdate.strategy = "latest_github_tag" autoupdate.strategy = "latest_github_tag"
[resources.system_user] [resources.system_user]

18
scripts/install
View file

@ -13,8 +13,8 @@ source /usr/share/yunohost/helpers
# RETRIEVE ARGUMENTS FROM THE MANIFEST # RETRIEVE ARGUMENTS FROM THE MANIFEST
#================================================= #=================================================
password=$(ynh_string_random 24) admin_password=$(ynh_string_random 24)
admin_password=$(openssl passwd -1 -salt xyz $password) admin_password_hashed=$(mkpasswd -m md5crypt --stdin <<< "$admin_password")
admin_username=$YNH_APP_ARG_USERNAME admin_username=$YNH_APP_ARG_USERNAME
admin_name=$YNH_APP_ARG_NAME admin_name=$YNH_APP_ARG_NAME
admin_email=$YNH_APP_ARG_EMAIL admin_email=$YNH_APP_ARG_EMAIL
@ -22,6 +22,7 @@ admin_email=$YNH_APP_ARG_EMAIL
ynh_app_setting_set --app=$app --key=admin_username --value=$admin_username ynh_app_setting_set --app=$app --key=admin_username --value=$admin_username
ynh_app_setting_set --app=$app --key=admin_name --value=$admin_name ynh_app_setting_set --app=$app --key=admin_name --value=$admin_name
ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email
ynh_app_setting_set --app=$app --key=admin_password --value=$admin_password
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
@ -43,11 +44,6 @@ ynh_script_progression --message="Configuring NGINX web server..."
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_nginx_config ynh_add_nginx_config
#=================================================
# PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring PHP-FPM..."
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage=low --footprint=low ynh_add_fpm_config --usage=low --footprint=low
@ -62,10 +58,10 @@ ynh_add_config --template="../conf/config.ini.php" --destination="$install_dir/d
ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql"
# Replace variables in sql scripts # Replace variables in sql scripts
ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql" ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql"
ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --target_file="../conf/sql/admin.sql" ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --target_file="../conf/sql/admin.sql"
ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email" --target_file="../conf/sql/admin.sql" ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email" --target_file="../conf/sql/admin.sql"
ynh_replace_string --match_string="__PASSWORD__" --replace_string="$admin_password" --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 "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql"

5
scripts/remove
View file

@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
# Remove the dedicated NGINX config # Remove the dedicated NGINX config
ynh_remove_nginx_config ynh_remove_nginx_config
#=================================================
# REMOVE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Removing PHP-FPM configuration"
# Remove the dedicated PHP-FPM config # Remove the dedicated PHP-FPM config
ynh_remove_fpm_config ynh_remove_fpm_config

10
scripts/restore
View file

@ -9,14 +9,6 @@
source ../settings/scripts/_common.sh source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RESTORE THE APP MAIN DIR # RESTORE THE APP MAIN DIR
#================================================= #=================================================
@ -34,6 +26,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" 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 # RESTORE THE MYSQL DATABASE
#================================================= #=================================================