YunoHost-Apps/moncycle_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/moncycle_ynh.git synced 2024-09-03 19:46:16 +02:00
Code Issues Activity Actions

Merge branch 'testing' into OniriCorpe-patch-1

Browse source
This commit is contained in:
Limezy 2024-02-21 18:18:20 +07:00 committed by GitHub
commit ac1db58d91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 111 additions and 395 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy
- automatic sending of cycles by email - automatic sending of cycles by email
- no data sales/no advertising - no data sales/no advertising
**Shipped version:** 9.0~ynh4 **Shipped version:** 10.0~ynh1
**Demo:** https://tableau.moncycle.app/connexion.php?email1=demo@moncycle.app&mdp=demo **Demo:** https://tableau.moncycle.app/connexion.php?email1=demo@moncycle.app&mdp=demo

2
README_fr.md
View file

@ -36,7 +36,7 @@ Rendre facile le suivi des cycles menstruels et l’application des méthodes na
- pas de vente de données/pas de publicité - pas de vente de données/pas de publicité
**Version incluse :** 9.0~ynh4 **Version incluse :** 10.0~ynh1
**Démo :** https://tableau.moncycle.app/connexion.php?email1=demo@moncycle.app&mdp=demo **Démo :** https://tableau.moncycle.app/connexion.php?email1=demo@moncycle.app&mdp=demo

2
conf/config.php
View file

@ -25,3 +25,5 @@ define("CONNEXION_COMPTE", true);
define("CSV_SEP", ";"); define("CSV_SEP", ";");
define("PHP_SECURE_COOKIES", true);

8
conf/extra_php-fpm.conf
View file

@ -14,4 +14,10 @@
; Session lifetime to avoid disconnections on PWA mode ; Session lifetime to avoid disconnections on PWA mode
php_admin_value[session.gc_maxlifetime] = 2592000 php_admin_value[session.gc_maxlifetime] = 2592000
php_admin_value[session.cookie_lifetime] = 2592000 php_admin_value[session.cookie_lifetime] = 2592000
php_value[session.save_path] = /var/www/__APP__/sessions php_value[session.save_path] = /var/www/__APP__/sessions
; caching php files
php_value[opcache.enable_cli]=1
php_value[opcache.max_accelerated_files]=100
php_value[opcache.memory_consumption]=32M
php_value[opcache.revalidate_freq]=300

6
conf/migrate_9.0.3.sql Normal file
View file

@ -0,0 +1,6 @@
ALTER TABLE `compte`
ADD `timeline_asc` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `nb_co_echoue`,
ADD `recherche` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `donateur`;
ALTER TABLE `observation`
ADD `compteur` tinyint(1) unsigned NULL AFTER `jour_sommet`;

6
conf/nginx.conf
View file

@ -25,8 +25,12 @@ location __PATH__/ {
access_log off; access_log off;
} }
location ~ ^/api/version {
rewrite ^/api/version$ /api/version.json;
}
# Default indexes and catch-all # Default indexes and catch-all
rewrite ^/(connexion|compte)$ /$1.html; rewrite ^/(connexion|compte)$ /$1.php;
rewrite ^/api/([a-zA-Z0-9_]+)(\?.*)?$ /api/$1.php$2; rewrite ^/api/([a-zA-Z0-9_]+)(\?.*)?$ /api/$1.php$2;
index index.php index.html; index index.php index.html;
try_files $uri $uri/ $uri.php?$args; try_files $uri $uri/ $uri.php?$args;

6
conf/version.json Normal file
View file

@ -0,0 +1,6 @@
{
"app": "moncycle.app",
"version": "10.0~ynh1",
"build": "2024-02-21",
"commit": "6e19865"
}

317
config_panel.toml.example
View file

@ -1,295 +1,34 @@
## Config panel are available from webadmin > Apps > YOUR_APP > Config Panel Button
## Those panels let user configure some params on their apps using a friendly interface,
## and remove the need to manually edit files from the command line.
## From a packager perspective, this .toml is coupled to the scripts/config script,
## which may be used to define custom getters/setters. However, most use cases
## should be covered automagically by the core, thus it may not be necessary
## to define a scripts/config at all!
## -----------------------------------------------------------------------------
## IMPORTANT: In accordance with YunoHost's spirit, please keep things simple and
## do not overwhelm the admin with tons of misunderstandable or advanced settings.
## -----------------------------------------------------------------------------
## The top level describe the entire config panels screen.
## The version is a required property.
## Here a small reminder to associate config panel version with YunoHost version
## | Config | YNH | Config panel small change log |
## | ------ | --- | ------------------------------------------------------- |
## | 0.1 | 3.x | 0.1 config script not compatible with YNH >= 4.3 |
## | 1.0 | 4.3.x | The new config panel system with 'bind' property |
version = "1.0" version = "1.0"
## (optional) i18n property let you internationalize questions, however this feature
## is only available in core configuration panel (like yunohost domain config).
## So in app config panel this key is ignored for now, but you can internationalize
## by using a lang dictionary (see property name bellow)
# i18n = "prefix_translation_key"
################################################################################
#### ABOUT PANELS
################################################################################
## The next level describes web admin panels
## You have to choose an ID for each panel, in this example the ID is "main"
## Keep in mind this ID will be used in CLI to refer to your question, so choose
## something short and meaningfull.
## In the webadmin, each panel corresponds to a distinct tab / form
[main] [main]
name = "Moncycle.app configuration"
## Define the label for your panel
## Internationalization works similarly to the 'description' and 'ask' questions in the manifest
# name.en = "Main configuration"
# name.fr = "Configuration principale"
## (optional) If you need to trigger a service reload-or-restart after the user
## change a question in this panel, you can add your service in the list.
services = ["__APP__"]
# or services = ["nginx", "__APP__"] to also reload-or-restart nginx
## (optional) This help properties is a short help displayed on the same line
## than the panel title but not displayed in the tab.
# help = ""
############################################################################ # [main.comptes]
#### ABOUT SECTIONS # name = "comptes"
############################################################################
# [main.comptes.creation_compte]
## A panel is composed of one or several sections. # ask.en = "Enable account creation"
## # ask.fr = "Permettre la création de nouveaux comptes"
## Sections are meant to group questions together when they correspond to # type = "select"
## a same subtopic. This impacts the rendering in terms of CLI prompts # choices = ["true", "false"]
## and HTML forms # default = "true"
## # help = "Don't disable account creation before creating one for yourself !"
## You should choose an ID for your section, and prefix it with the panel ID # bind = "CREATION_COMPTE:__INSTALL_DIR__/config.php"
## (Be sure to not make a typo in the panel ID, which would implicitly create #
## an other entire panel) # [main.comptes.connexion_compte]
## # ask.en = "Enable account connexion"
## We use the context of pepettes_ynh as an example, # ask.fr = "Permettre la connexion aux comptes"
## which is a simple donation form app written in python, # type = "select"
## and for which the admin will want to edit the configuration # choices = ["true", "false"]
[main.customization] # default = "true"
# bind = "CONNEXION_COMPTE:__INSTALL_DIR__/config.php"
## (optional) Defining a proper title for sections is not mandatory
## and depends on the exact rendering you're aiming for the CLI / webadmin
name = ""
## (optional) This help properties is a short help displayed on the same line
## than the section title, meant to provide additional details
# help = ""
## (optional) As for panel, you can specify to trigger a service [main.export]
## reload-or-restart after the user change a question in this section. name = "export"
## This property is added to the panel property, it doesn't deactivate it.
## So no need to replicate, the service list from panel services property.
# services = []
## (optional) By default all questions are optionals, but you can specify a
## default behaviour for question in the section
optional = false
## (optional) It's also possible with the 'visible' property to only [main.export.csv_sep]
## display the section depending on the user's answers to previous questions. #ask.en = "Separator for data export in csv format"
## #ask.fr = "Séparateur pour l'export des données au format csv"
## Be careful that the 'visible' property should only refer to **previous** questions bind = ":__INSTALL_DIR__/config.php"
## Hence, it should not make sense to have a "visible" property on the very first section.
##
## Also, keep in mind that this feature only works in the webadmin and not in CLI
## (therefore a user could be prompted in CLI for a question that may not be relevant)
# visible = true
########################################################################
#### ABOUT QUESTIONS
########################################################################
## A section is compound of one or several questions.
## ---------------------------------------------------------------------
## IMPORTANT: as for panel and section you have to choose an ID, but this
## one should be unique in all this document, even if the question is in
## an other panel.
## ---------------------------------------------------------------------
## You can use same questions types and properties than in manifest.yml
## install part. However, in YNH 4.3, a lot of change has been made to
## extend availables questions types list.
## See: TODO DOC LINK
[main.customization.project_name]
## (required) The ask property is equivalent to the ask property in
## the manifest. However, in config panels, questions are displayed on the
## left side and therefore have less space to be rendered. Therefore,
## it is better to use a short question, and use the "help" property to
## provide additional details if necessary.
ask.en = "Name of the project"
## (required) The type property indicates how the question should be
## displayed, validated and managed. Some types have specific properties.
##
## Types available: string, boolean, number, range, text, password, path
## email, url, date, time, color, select, domain, user, tags, file.
##
## For a complete list with specific properties, see: TODO DOC LINK
type = "string" type = "string"
#default = ";"
########################################################################
#### ABOUT THE BIND PROPERTY
########################################################################
## (recommended) 'bind' property is a powerful feature that let you
## configure how and where the data will be read, validated and written.
## By default, 'bind property is in "settings" mode, it means it will
## **only** read and write the value in application settings file.
## bind = "settings"
## However, settings usually correspond to key/values in actual app configurations
## Hence, a more useful mode is to have bind = ":FILENAME". In that case, YunoHost
## will automagically find a line with "KEY=VALUE" in FILENAME
## (with the adequate separator between KEY and VALUE)
##
## YunoHost will then use this value for the read/get operation.
## During write/set operations, YunoHost will overwrite the value
## in **both** FILENAME and in the app's settings.yml
## Configuration file format supported: yaml, toml, json, ini, env, php,
## python. The feature probably works with others formats, but should be tested carefully.
## Note that this feature only works with relatively simple cases
## such as `KEY: VALUE`, but won't properly work with
## complex data structures like multilin array/lists or dictionnaries.
## It also doesn't work with XML format, custom config function call, php define(), ...
## More info on TODO
# bind = ":/var/www/__APP__/settings.py"
## By default, bind = ":FILENAME" will use the question ID as KEY
## ... but the question ID may sometime not be the exact KEY name in the configuration file.
##
## In particular, in pepettes, the python variable is 'name' and not 'project_name'
## (c.f. https://github.com/YunoHost-Apps/pepettes_ynh/blob/5cc2d3ffd6529cc7356ff93af92dbb6785c3ab9a/conf/settings.py##L11 )
##
## In that case, the key name can be specified before the column ':'
bind = "name:/var/www/__APP__/settings.py"
## ---------------------------------------------------------------------
## IMPORTANT: other 'bind' mode exists:
##
## bind = "FILENAME" (with no column character before FILENAME)
## may be used to bind to the **entire file content** (instead of a single KEY/VALUE)
## This could be used to expose an entire configuration file, or binary files such as images
## For example:
## bind = "/var/www/__APP__/img/logo.png"
##
## bind = "null" can be used to disable reading / writing in settings.
## This creates sort of a "virtual" or "ephemeral" question which is not related to any actual setting
## In this mode, you are expected to define custom getter/setters/validators in scripts/config:
##
## getter: get__QUESTIONID()
## setter: set__QUESTIONID()
## validator: validate__QUESTIONID()
##
## You can also specify a common getter / setter / validator, with the
## function 'bind' mode, for example here it will try to run
## get__array_settings() first.
# bind = "array_settings()"
## ---------------------------------------------------------------------
## ---------------------------------------------------------------------
## IMPORTANT: with the exception of bind=null questions,
## question IDs should almost **always** correspond to an app setting
## initialized / reused during install/upgrade.
## Not doing so may result in inconsistencies between the config panel mechanism
## and the use of ynh_add_config
## ---------------------------------------------------------------------
########################################################################
#### OTHER GENERIC PROPERTY FOR QUESTIONS
########################################################################
## (optional) An help text for the question
help = "Fill the name of the project which will received donation"
## (optional) An example display as placeholder in web form
# example = "YunoHost"
## (optional) set to true in order to redact the value in operation logs
# redact = false
## (optional) A validation pattern
## ---------------------------------------------------------------------
## IMPORTANT: your pattern should be between simple quote, not double.
## ---------------------------------------------------------------------
pattern.regexp = '^\w{3,30}$'
pattern.error = "The name should be at least 3 chars and less than 30 chars. Alphanumeric chars are accepted"
## Note: visible and optional properties are also available for questions
[main.customization.contact_url]
ask = "Contact url"
type = "url"
example = "mailto: contact@example.org"
help = "mailto: accepted"
pattern.regexp = '^mailto:[^@]+@[^@]+|https://$'
pattern.error = "Should be https or mailto:"
bind = ":/var/www/__APP__/settings.py"
[main.customization.logo]
ask = "Logo"
type = "file"
accept = ".png"
help = "Fill with an already resized logo"
bind = "__FINALPATH__/img/logo.png"
[main.customization.favicon]
ask = "Favicon"
type = "file"
accept = ".png"
help = "Fill with an already sized favicon"
bind = "__FINALPATH__/img/favicon.png"
[main.stripe]
name = "Stripe general info"
optional = false
# The next alert is overwrited with a getter from the config script
[main.stripe.amount]
ask = "Donation in the month : XX €
type = "alert"
style = "success"
[main.stripe.publishable_key]
ask = "Publishable key"
type = "string"
redact = true
help = "Indicate here the stripe publishable key"
bind = ":/var/www/__APP__/settings.py"
[main.stripe.secret_key]
ask = "Secret key"
type = "string"
redact = true
help = "Indicate here the stripe secret key"
bind = ":/var/www/__APP__/settings.py"
[main.stripe.prices]
ask = "Prices ID"
type = "tags"
help = """\
Indicates here the prices ID of donation products you created in stripe interfaces. \
Go on [Stripe products](https://dashboard.stripe.com/products) to create those donation products. \
Fill it tag with 'FREQUENCY/CURRENCY/PRICE_ID' \
FREQUENCY: 'one_time' or 'recuring' \
CURRENCY: 'EUR' or 'USD' \
PRICE_ID: ID from stripe interfaces starting with 'price_' \
"""
pattern.regexp = '^(one_time|recuring)/(EUR|USD)/price_.*$'
pattern.error = "Please respect the format describe in help text for each price ID"

2
doc/POST_INSTALL.md
View file

@ -1,4 +1,4 @@
* After installing, you can create your own user using the form * After installing, you can create your own user using the form
* Once done, you can (if you want) set the account creation to false in `__INSTALL_DIR__/config.php` * Once done, you can (if you want) set the account creation to false in `/var/www/moncycle/config.php`
* If you want to use the app in PWA mode, be sure to be connected to your account first * If you want to use the app in PWA mode, be sure to be connected to your account first
* After upgrading from 7.0 to 9.0, you may experience issues if you don't clean your browser cache * After upgrading from 7.0 to 9.0, you may experience issues if you don't clean your browser cache

8
manifest.toml
View file

@ -5,7 +5,7 @@ name = "Moncycle"
description.en = "Menstrual cycle follow-up for natural family planning" description.en = "Menstrual cycle follow-up for natural family planning"
description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance" description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance"
version = "9.0~ynh4" version = "10.0~ynh1"
maintainers = ["Raoul de Limezy"] maintainers = ["Raoul de Limezy"]
@ -34,8 +34,8 @@ ram.runtime = "50M"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/jean-io/moncycle.app/archive/cda74b19c2b392886aed48f0ae3a6c6d9b2869a3.zip" url = "https://github.com/jean-io/moncycle.app/archive/6e198655d54370f782f9c74a7361724a87090f13.zip"
sha256 = "e7b4a6b3350d80106245cd27a529e53ed477764ee59686d8a6f599faec9997e6" sha256 = "9bc1ee0890ee649c0ee16f56de2165778f398be450201be9329c25675ca457e8"
autoupdate.strategy = "latest_github_release" autoupdate.strategy = "latest_github_release"
[resources.system_user] [resources.system_user]
@ -46,7 +46,7 @@ ram.runtime = "50M"
main.url = "/" main.url = "/"
[resources.apt] [resources.apt]
packages = "mariadb-server, php8.2-gd, php8.2-mysql, php8.2-xml, php8.2-mbstring" packages = "mariadb-server, php8.3-gd, php8.3-mysql, php8.3-xml, php8.3-mbstring, php8.3-opcache"
[resources.database] [resources.database]
type = "mysql" type = "mysql"

75
scripts/config
View file

@ -24,77 +24,10 @@ ynh_abort_if_errors
final_path=$(ynh_app_setting_get $app final_path) final_path=$(ynh_app_setting_get $app final_path)
#================================================= ## import needed settings
# SPECIFIC GETTERS FOR TOML SHORT KEY #creation_compte=$(ynh_app_setting_get --app="$app" --key=creation_compte)
#================================================= #connexion_compte=$(ynh_app_setting_get --app="$app" --key=connexion_compte)
#csv_sep=$(ynh_app_setting_get --app="$app" --key=csv_sep)
get__amount() {
# Here we can imagine to have an API call to stripe to know the amount of donation during a month
local amount = 200
# It's possible to change some properties of the question by overriding it:
if [ $amount -gt 100 ]
then
cat << EOF
style: success
value: $amount
ask:
en: A lot of donation this month: **$amount €**
EOF
else
cat << EOF
style: danger
value: $amount
ask:
en: Not so much donation this month: $amount €
EOF
fi
}
get__prices() {
local prices = "$(grep "DONATION\['" "$final_path/settings.py" | sed -r "s@^DONATION\['([^']*)'\]\['([^']*)'\] = '([^']*)'@\1/\2/\3@g" | sed -z 's/\n/,/g;s/,$/\n/')"
if [ "$prices" == "," ];
then
# Return YNH_NULL if you prefer to not return a value at all.
echo YNH_NULL
else
echo $prices
fi
}
#=================================================
# SPECIFIC VALIDATORS FOR TOML SHORT KEYS
#=================================================
validate__publishable_key() {
# We can imagine here we test if the key is really a publisheable key
(is_secret_key $publishable_key) &&
echo 'This key seems to be a secret key'
}
#=================================================
# SPECIFIC SETTERS FOR TOML SHORT KEYS
#=================================================
set__prices() {
#---------------------------------------------
# IMPORTANT: setter are trigger only if a change is detected
#---------------------------------------------
for price in $(echo $prices | sed "s/,/ /"); do
frequency=$(echo $price | cut -d/ -f1)
currency=$(echo $price | cut -d/ -f2)
price_id=$(echo $price | cut -d/ -f3)
sed "d/DONATION\['$frequency'\]\['$currency'\]" "$final_path/settings.py"
echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$final_path/settings.py"
done
#---------------------------------------------
# IMPORTANT: to be able to upgrade properly, you have to saved the value in settings too
#---------------------------------------------
ynh_app_setting_set $app prices $prices
}
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION

6
scripts/install
View file

@ -17,7 +17,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir"
ynh_exec_warn_less mkdir "$install_dir/sessions"
ynh_exec_warn_less mkdir "$install_dir/soap_cache" ynh_exec_warn_less mkdir "$install_dir/soap_cache"
ynh_exec_warn_less mkdir "$install_dir/composer" ynh_exec_warn_less mkdir "$install_dir/composer"
@ -66,10 +65,13 @@ chmod 644 "/etc/cron.d/$app"
ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
chmod 400 "$install_dir/config.php" chmod 400 "$install_dir/config.php"
chown $app:$app "$install_dir/config.php" chown $app:$app "$install_dir/config.php"
ynh_add_config --template="../conf/version.json" --destination="$install_dir/api/version.json"
chmod 655 "$install_dir/api/version.json"
chown $app:www-data "$install_dir/api/version.json"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================

27
scripts/upgrade
View file

@ -9,12 +9,6 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# CHECK VERSION
#=================================================
upgrade_type=$(ynh_check_app_version_changed)
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
@ -29,7 +23,6 @@ popd
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" --full_replace=1 ynh_setup_source --dest_dir="$install_dir" --full_replace=1
ynh_exec_warn_less mkdir "$install_dir/sessions"
ynh_exec_warn_less mkdir "$install_dir/soap_cache" ynh_exec_warn_less mkdir "$install_dir/soap_cache"
ynh_exec_warn_less mkdir "$install_dir/composer" ynh_exec_warn_less mkdir "$install_dir/composer"
@ -41,6 +34,8 @@ pushd "$install_dir"
ynh_exec_warn_less mv ./www_data/* . ynh_exec_warn_less mv ./www_data/* .
ynh_exec_warn_less mv /tmp/config.php . ynh_exec_warn_less mv /tmp/config.php .
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < db/demo.sql
ynh_script_progression --message="Checking if a database migration is needed" ynh_script_progression --message="Checking if a database migration is needed"
if ynh_compare_current_package_version --comparison le --version 7.0~ynh5 if ynh_compare_current_package_version --comparison le --version 7.0~ynh5
then then
@ -49,14 +44,24 @@ pushd "$install_dir"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.5.sql ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.5.sql
ynh_add_config --template="../conf/migrate_7.0.6.sql" --destination="$install_dir/migrate_7.0.6.sql" ynh_add_config --template="../conf/migrate_7.0.6.sql" --destination="$install_dir/migrate_7.0.6.sql"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql
ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql
else else
if ynh_compare_current_package_version --comparison le --version 7.0~ynh6 if ynh_compare_current_package_version --comparison le --version 7.0~ynh6
then then
ynh_script_progression --message="7.0.6 to 8.0 database migration required, migrating" ynh_script_progression --message="7.0.6 to 8.0 database migration required, migrating"
ynh_add_config --template="../conf/migrate_7.0.6.sql" --destination="$install_dir/migrate_7.0.6.sql" ynh_add_config --template="../conf/migrate_7.0.6.sql" --destination="$install_dir/migrate_7.0.6.sql"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql
ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql
else else
ynh_script_progression --message="7.0.6 to 8.0 database migration not required since package > 7.0.6" if ynh_compare_current_package_version --comparison le --version 9.0~ynh3
then
ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql"
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql
else
ynh_script_progression --message="7.0.6 to 8.0 database migration not required since package > 7.0.6"
fi
fi fi
fi fi
ynh_script_progression --message="You shouldn't see this" ynh_script_progression --message="You shouldn't see this"
@ -102,6 +107,12 @@ ynh_add_config --template="../conf/config.php" --destination="$install_dir/confi
chmod 400 "$install_dir/config.php" chmod 400 "$install_dir/config.php"
chown $app:$app "$install_dir/config.php" chown $app:$app "$install_dir/config.php"
# Remove old version file and replace it
ynh_secure_remove --file="$install_dir/api/version.json"
ynh_add_config --template="../conf/version.json" --destination="$install_dir/api/version.json"
chmod 655 "$install_dir/api/version.json"
chown $app:www-data "$install_dir/api/version.json"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================

16
sources/patches/app-01-mail.patch
View file

@ -1,16 +0,0 @@
diff --git a/www_data/lib/mail.php b/www_data/lib/mail.php
index 363aeb7..343e33b 100644
--- a/www_data/lib/mail.php
+++ b/www_data/lib/mail.php
@@ -15,10 +15,10 @@ function mail_init(){
$mail->isSMTP();
$mail->Host = SMTP_HOST;
- $mail->SMTPAuth = true;
$mail->Username = SMTP_MAIL;
$mail->Password = SMTP_PASSWORD;
- $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS;
+ $mail->SMTPAutoTLS = false;
+ $mail->SMTPSecure = false;
$mail->Port = SMTP_PORT;
$mail->CharSet = 'UTF-8';

23
sources/patches/main-01-mail.patch Normal file
View file

@ -0,0 +1,23 @@
diff --git a/www_data/lib/mail.php b/www_data/lib/mail.php
index 9b58b50..0112cc5 100644
--- a/www_data/lib/mail.php
+++ b/www_data/lib/mail.php
@@ -12,16 +12,14 @@ use PHPMailer\PHPMailer\PHPMailer;
function mail_init(){
$mail = new PHPMailer();
-
$mail->isSMTP();
$mail->Host = SMTP_HOST;
- $mail->SMTPAuth = true;
+ $mail->SMTPAuth = false;
$mail->Username = SMTP_MAIL;
$mail->Password = SMTP_PASSWORD;
- $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS;
+ $mail->SMTPSecure = false;
$mail->Port = SMTP_PORT;
$mail->CharSet = 'UTF-8';
-
$mail->setFrom(SMTP_MAIL, 'moncycle.app');
return $mail;
}