Merge pull request #16 from YunoHost-Apps/testing

Testing
This commit is contained in:
eric_G 2024-09-11 16:25:06 +02:00 committed by GitHub
commit 348afd237e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 117 additions and 133 deletions

View file

@ -6,5 +6,6 @@
- [Lire le README en français](README_fr.md)
- [Le o README en galego](README_gl.md)
- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
- [Lees de README in het Nederlands](README_nl.md)
- [Прочитать README на русский](README_ru.md)
- [阅读中文(简体)的 README](README_zh_Hans.md)

View file

@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
**Shipped version:** 1.5.0~ynh2
**Shipped version:** 1.5.0~ynh3
**Demo:** <https://demo.easyappointments.org/>

View file

@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
**Versión actual:** 1.5.0~ynh2
**Versión actual:** 1.5.0~ynh3
**Demo:** <https://demo.easyappointments.org/>
@ -48,7 +48,7 @@ The application is designed to be flexible enough so that it can handle any ente
## Información para desarrolladores
Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/easyappointments_ynh/tree/testing
Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/easyappointments_ynh/tree/testing).
Para probar la rama `testing`, sigue asÍ:

View file

@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
**Paketatutako bertsioa:** 1.5.0~ynh2
**Paketatutako bertsioa:** 1.5.0~ynh3
**Demoa:** <https://demo.easyappointments.org/>

View file

@ -29,7 +29,7 @@ Easy!Appointments est une application Web hautement personnalisable qui permet a
- Interface utilisateur traduite.
**Version incluse:** 1.5.0~ynh2
**Version incluse:** 1.5.0~ynh3
**Démo:** <https://demo.easyappointments.org/>

View file

@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
**Versión proporcionada:** 1.5.0~ynh2
**Versión proporcionada:** 1.5.0~ynh3
**Demo:** <https://demo.easyappointments.org/>

View file

@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
**Versi terkirim:** 1.5.0~ynh2
**Versi terkirim:** 1.5.0~ynh3
**Demo:** <https://demo.easyappointments.org/>

61
README_nl.md Normal file
View file

@ -0,0 +1,61 @@
<!--
NB: Deze README is automatisch gegenereerd door <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
Hij mag NIET handmatig aangepast worden.
-->
# Easy!Appointments voor Yunohost
[![Integratieniveau](https://dash.yunohost.org/integration/easyappointments.svg)](https://ci-apps.yunohost.org/ci/apps/easyappointments/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
[![Easy!Appointments met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=easyappointments)
*[Deze README in een andere taal lezen.](./ALL_README.md)*
> *Met dit pakket kun je Easy!Appointments snel en eenvoudig op een YunoHost-server installeren.*
> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.*
## Overzicht
Easy!Appointments is a highly customizable web application that allows customers to book appointments with you via a sophisticated web interface. Moreover, it provides the ability to sync your data with Google Calendar so you can use them with other services. It is an open source project that you can download and install even for commercial use. Easy!Appointments will run smoothly with your existing website as it can be installed in a single folder of the server and of course share an existing database.
### Features
The application is designed to be flexible enough so that it can handle any enterprise work flow.
- Customers and appointments management.
- Services and providers organization.
- Working plan and booking rules.
- Google Calendar synchronization.
- Email notifications system.
- Self hosted installation.
- Translated user interface.
**Geleverde versie:** 1.5.0~ynh3
**Demo:** <https://demo.easyappointments.org/>
## Schermafdrukken
![Schermafdrukken van Easy!Appointments](./doc/screenshots/screenshots.png)
## Documentatie en bronnen
- Officiele website van de app: <https://easyappointments.org/>
- Officiele beheerdersdocumentatie: <https://easyappointments.org/docs.html#1.4.3/readme.md>
- Upstream app codedepot: <https://github.com/alextselegidis/easyappointments>
- YunoHost-store: <https://apps.yunohost.org/app/easyappointments>
- Meld een bug: <https://github.com/YunoHost-Apps/easyappointments_ynh/issues>
## Ontwikkelaarsinformatie
Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/easyappointments_ynh/tree/testing).
Om de `testing`-branch uit te proberen, ga als volgt te werk:
```bash
sudo yunohost app install https://github.com/YunoHost-Apps/easyappointments_ynh/tree/testing --debug
of
sudo yunohost app upgrade easyappointments -u https://github.com/YunoHost-Apps/easyappointments_ynh/tree/testing --debug
```
**Verdere informatie over app-packaging:** <https://yunohost.org/packaging_apps>

View file

@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
**Поставляемая версия:** 1.5.0~ynh2
**Поставляемая версия:** 1.5.0~ynh3
**Демо-версия:** <https://demo.easyappointments.org/>

View file

@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
**分发版本:** 1.5.0~ynh2
**分发版本:** 1.5.0~ynh3
**演示:** <https://demo.easyappointments.org/>

View file

@ -1,4 +0,0 @@
; Additional php.ini defines, specific to this pool of workers.
php_admin_value[upload_max_filesize] = 50M
php_admin_value[post_max_size] = 50M

View file

@ -12,7 +12,7 @@ location __PATH__/ {
try_files $uri $uri/ index.php;
location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__APP__.sock;
fastcgi_index index.php;
include fastcgi_params;

BIN
doc/.DS_Store vendored

Binary file not shown.

View file

@ -5,7 +5,7 @@ name = "Easy!Appointments"
description.en = "Open Source Appointment Scheduler"
description.fr = "Planificateur de rendez-vous Open Source"
version = "1.5.0~ynh2"
version = "1.5.0~ynh3"
maintainers = []
@ -17,7 +17,8 @@ admindoc = "https://easyappointments.org/docs.html#1.4.3/readme.md"
code = "https://github.com/alextselegidis/easyappointments"
[integration]
yunohost = ">= 11.2.27"
yunohost = ">= 11.2.20"
helpers_version = "2.1"
architectures = "all"
multi_instance = true
@ -54,6 +55,7 @@ ram.runtime = "50M"
[resources.system_user]
[resources.install_dir]
group = "www-data:r-x"
[resources.permissions]
main.url = "/"

View file

@ -1,17 +1,5 @@
#!/bin/bash
#=================================================
# COMMON VARIABLES
#=================================================
#=================================================
# PERSONAL HELPERS
#=================================================
#=================================================
# EXPERIMENTAL HELPERS
#=================================================
#=================================================
# FUTURE OFFICIAL HELPERS
# COMMON VARIABLES AND CUSTOM HELPERS
#=================================================

View file

@ -1,43 +1,33 @@
#!/bin/bash
#=================================================
# GENERIC START
#=================================================
# IMPORT GENERIC HELPERS
#=================================================
# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers
#=================================================
# DECLARE DATA AND CONF FILES TO BACKUP
#=================================================
ynh_print_info --message="Declaring files to be backed up..."
ynh_print_info "Declaring files to be backed up..."
#=================================================
# BACKUP THE APP MAIN DIR
#=================================================
ynh_backup --src_path="$install_dir"
ynh_backup "$install_dir"
#=================================================
# SYSTEM CONFIGURATION
#=================================================
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf"
#=================================================
# BACKUP THE MYSQL DATABASE
#=================================================
ynh_print_info --message="Backing up the MySQL database..."
ynh_print_info "Backing up the MySQL database..."
ynh_mysql_dump_db --database="$db_name" > db.sql
ynh_mysql_dump_db > db.sql
#=================================================
# END OF SCRIPT
#=================================================
ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

View file

@ -1,38 +1,25 @@
#!/bin/bash
#=================================================
# GENERIC STARTING
#=================================================
# IMPORT GENERIC HELPERS
#=================================================
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# STANDARD MODIFICATIONS
#=================================================
# MODIFY URL IN NGINX CONF
#=================================================
ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2
ynh_script_progression "Updating NGINX web server configuration..."
ynh_change_url_nginx_config
ynh_config_change_url_nginx
#=================================================
# SPECIFIC MODIFICATIONS
#=================================================
# UPDATE A CONFIG FILE
#=================================================
ynh_script_progression --message="Updating a configuration file..." --weight=1
ynh_script_progression "Updating configuration..."
domain=$new_domain
ynh_add_config --template="config.php" --destination="$install_dir/config.php"
chmod 400 "$install_dir/config.php"
chown $app:$app "$install_dir/config.php"
ynh_config_add --template="config.php" --destination="$install_dir/config.php"
#=================================================
# END OF SCRIPT
#=================================================
ynh_script_progression --message="Change of URL completed for $app" --last
ynh_script_progression "Change of URL completed for $app"

View file

@ -1,48 +1,37 @@
#!/bin/bash
#=================================================
# GENERIC START
#=================================================
# IMPORT GENERIC HELPERS
#=================================================
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
ynh_script_progression --message="Setting up source files..." --weight=7
ynh_script_progression "Setting up source files..."
ynh_setup_source --dest_dir="$install_dir"
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
chmod -R 770 "$install_dir/storage"
#=================================================
# SYSTEM CONFIGURATION
#=================================================
ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
ynh_script_progression "Adding system configurations related to $app..."
ynh_add_nginx_config
ynh_config_add_nginx
ynh_add_fpm_config
ynh_config_add_phpfpm
#=================================================
# SPECIFIC SETUP
#=================================================
# ADD A CONFIGURATION
#=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_script_progression "Adding $app's configuration..."
ynh_add_config --template="config.php" --destination="$install_dir/config.php"
chmod 400 "$install_dir/config.php"
chown $app "$install_dir/config.php"
ynh_config_add --template="config.php" --destination="$install_dir/config.php"
#=================================================
# END OF SCRIPT
#=================================================
ynh_script_progression --message="Installation of $app completed" --last
ynh_script_progression "Installation of $app completed"

View file

@ -1,27 +1,19 @@
#!/bin/bash
#=================================================
# GENERIC START
#=================================================
# IMPORT GENERIC HELPERS
#=================================================
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# REMOVE SYSTEM CONFIGURATIONS
#=================================================
# REMOVE SYSTEMD SERVICE
#=================================================
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
ynh_script_progression "Removing system configurations related to $app..."
ynh_remove_nginx_config
ynh_config_remove_nginx
ynh_remove_fpm_config
ynh_config_remove_phpfpm
#=================================================
# END OF SCRIPT
#=================================================
ynh_script_progression --message="Removal of $app completed" --last
ynh_script_progression "Removal of $app completed"

View file

@ -1,55 +1,41 @@
#!/bin/bash
#=================================================
# GENERIC START
#=================================================
# IMPORT GENERIC HELPERS
#=================================================
# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers
#=================================================
# RESTORE THE APP MAIN DIR
#=================================================
ynh_script_progression --message="Restoring the app main directory..." --weight=2
ynh_script_progression "Restoring the app main directory..."
ynh_restore_file --origin_path="$install_dir"
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
ynh_restore "$install_dir"
#=================================================
# RESTORE THE MYSQL DATABASE
#=================================================
ynh_script_progression --message="Restoring the MySQL database..." --weight=5
ynh_script_progression "Restoring the MySQL database..."
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
ynh_mysql_db_shell < ./db.sql
#=================================================
# RESTORE SYSTEM CONFIGURATIONS
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
ynh_script_progression "Restoring system configurations related to $app..."
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf"
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
#=================================================
# GENERIC FINALIZATION
#=================================================
# RELOAD NGINX AND PHP-FPM
#=================================================
ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2
ynh_script_progression "Reloading NGINX web server and PHP-FPM..."
ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
ynh_systemd_action --service_name=nginx --action=reload
ynh_systemctl --service=php$php_version-fpm --action=reload
ynh_systemctl --service=nginx --action=reload
#=================================================
# END OF SCRIPT
#=================================================
ynh_script_progression --message="Restoration completed for $app" --last
ynh_script_progression "Restoration completed for $app"

View file

@ -1,40 +1,32 @@
#!/bin/bash
#=================================================
# GENERIC START
#=================================================
# IMPORT GENERIC HELPERS
#=================================================
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
ynh_script_progression --message="Upgrading source files..." --weight=1
ynh_script_progression "Upgrading source files..."
ynh_setup_source --dest_dir="$install_dir" --keep="config.php storage/"
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
chmod -R 770 "$install_dir/storage"
pushd "$install_dir"
php$phpversion $install_dir/index.php console migrate
php$php_version $install_dir/index.php console migrate
popd
#=================================================
# REAPPLY SYSTEM CONFIGURATIONS
#=================================================
ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
ynh_script_progression "Upgrading system configurations related to $app..."
ynh_add_nginx_config
ynh_config_add_nginx
ynh_add_fpm_config
ynh_config_add_phpfpm
#=================================================
# END OF SCRIPT
#=================================================
ynh_script_progression --message="Upgrade of $app completed" --last
ynh_script_progression "Upgrade of $app completed"