diff --git a/README.md b/README.md index 05f2a4f..403eebe 100644 --- a/README.md +++ b/README.md @@ -23,36 +23,52 @@ webtrees allows you to view and edit your genealogy on your website. It has full ## Demo * [Official demo](https://dev.webtrees.net/demo-dev/index.php?ctype=gedcom&ged=demo) + +## Configuration + +How to configure this app: From an admin panel, a plain file with SSH, or any other way. + ## Documentation * Official documentation: https://wiki.webtrees.net + * YunoHost documentation: If specific documentation is needed, feel free to contribute. ## YunoHost specific features -#### Multi-users support +#### Multi-user support -No LDAP configuration is there for Webtrees yet.
-Multi-instance: **yes** +Are LDAP and HTTP auth supported? +Can the app be used by multiple users? #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) +## Limitations + +* Any known limitations. + +## Additional information + +* Other info you would like to add about this app. + +**More info on the documentation page:** +https://yunohost.org/packaging_apps ## Links * Report a bug: https://github.com/YunoHost-Apps/webtrees_ynh/issues * App website: https://www.webtrees.net - * Git repository: https://github.com/fisharebest/webtrees + * Upstream app repository: https://github.com/fisharebest/webtrees * YunoHost website: https://yunohost.org/ --- -Developers info +Developer info ---------------- **Only if you want to use a testing branch for coding, instead of merging directly into master.** -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). To try the testing branch, please proceed like that. ``` diff --git a/manifest.json b/manifest.json index 8ed091c..1ae7eea 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "webtrees", "packaging_format": 1, "description": { - "en": "Webtrees is a free open source web-based genealogy application.", - "fr": "Webtrees est un logiciel libre de généalogie en ligne." + "en": "This app is a free open source web-based genealogy application.", + "fr": "Cette application est un logiciel libre de généalogie en ligne." }, "version":"2.0.7~ynh1", "url": "https://www.webtrees.net", @@ -14,12 +14,12 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8" }, "multi_instance": true, "services": [ - "nginx", - "php7.1-fpm", + "nginx", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index b1415ed..60c4ab5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="php-gd php-xml mailutils" +pkg_dependencies="php7.3-gd php7.3-xml mailutils php7.3-fpm" #================================================= # PERSONAL HELPERS @@ -19,17 +19,6 @@ pkg_dependencies="php-gd php-xml mailutils" # FUTURE OFFICIAL HELPERS #================================================= -# Delete a file checksum from the app settings -# -# $app should be defined when calling this helper -# -# usage: ynh_remove_file_checksum file -# | arg: file - The file for which the checksum will be deleted -ynh_delete_file_checksum () { - local checksum_setting_name=checksum_${1//[\/ ]/_} # Replace all '/' and ' ' by '_' - ynh_app_setting_delete $app $checksum_setting_name -} - # Send an email to inform the administrator # # usage: ynh_send_readme_to_admin app_message [recipients] @@ -68,12 +57,7 @@ ynh_send_readme_to_admin() { local mail_subject="☁️🆈🅽🅷☁️: \`$app\` has important message for you" - local mail_message="This is an automated message from your beloved YunoHost server. -Specific information for the application $app. -$app_message ---- -Automatic diagnosis data from YunoHost -$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" + local mail_message="This is an automated message from your beloved YunoHost server. \nSpecific information for the application $app.\n$app_message\n---\nAutomatic diagnosis data from YunoHost\n$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" # Define binary to use for mail command if [ -e /usr/bin/bsd-mailx ] diff --git a/scripts/install b/scripts/install index 9086088..3802a17 100755 --- a/scripts/install +++ b/scripts/install @@ -111,7 +111,7 @@ ynh_replace_string "__dbpass__" "$db_pwd" "../conf/config.ini.php" ynh_replace_string "__dbname__" "$db_name" "../conf/config.ini.php" # Copy the config file to the final path -sudo cp ../conf/config.ini.php $final_path/data/. +cp ../conf/config.ini.php $final_path/data/. # Load initial SQL into the new database ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" @@ -139,7 +139,7 @@ ynh_store_file_checksum "$final_path/data/config.ini.php" # Set permissions to app files chown -R $app: $final_path -sudo chmod -R 700 $final_path/data +chmod -R 700 $final_path/data #================================================= # SETUP SSOWAT @@ -149,8 +149,8 @@ ynh_print_info "Configuring SSOwat..." # Make app public if necessary if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set $app unprotected_uris "/" + # unprotected_uris allows SSO credentials to be passed anyway. + ynh_app_setting_set $app unprotected_uris "/" fi #================================================= diff --git a/scripts/restore b/scripts/restore index e3f8b14..773be0d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -68,8 +68,8 @@ ynh_system_user_create $app #================================================= # Restore permissions to app files -sudo chown -R $app: "${final_path}" -sudo chmod -R 700 $final_path/data +chown -R $app: "${final_path}" +chmod -R 700 $final_path/data #================================================= # RESTORE THE PHP-FPM CONFIGURATION