mirror of
https://github.com/YunoHost-Apps/dolibarr_ynh.git
synced 2024-09-03 18:35:53 +02:00
Update to 16.0.3 & fixs
Update to 16.0.3 & fixs
This commit is contained in:
mastereur
GitHub
commit
a2edeba94c
9 changed files with 40 additions and 31 deletions
|
|
@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
|
||||
Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.).
|
||||
|
||||
**Shipped version:** 16.0.1~ynh1
|
||||
**Shipped version:** 16.0.3~ynh1
|
||||
|
||||
**Demo:** https://www.dolibarr.org/onlinedemo
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
|||
|
||||
Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.).
|
||||
|
||||
**Version incluse :** 16.0.1~ynh1
|
||||
**Version incluse :** 16.0.3~ynh1
|
||||
|
||||
**Démo :** https://www.dolibarr.org/onlinedemo
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
#!/bin/bash
|
||||
app=__APP__
|
||||
src_path=__FINALPATH__
|
||||
member=__MEMBER__
|
||||
app="$(basename $0 | cut -d- -f 2-)" # Extract the app name from the script name, which is supposed to be something like "50-app_id"
|
||||
src_path=$(yunohost app setting $app final_path)
|
||||
# member=__MEMBER__
|
||||
|
||||
# Sync users
|
||||
if sudo php $src_path/scripts/user/sync_users_ldap2dolibarr.php commitiferror --server=localhost -y; then
|
||||
if sudo php "$src_path/scripts/user/sync_users_ldap2dolibarr.php" commitiferror --server=localhost -y; then
|
||||
echo ldap user update ok
|
||||
else
|
||||
echo ldap user update ended with error
|
||||
fi
|
||||
|
||||
# If YNH users should also be members, sync members
|
||||
if [ $member -eq 1 ];
|
||||
then
|
||||
if sudo php $src_path/scripts/members/sync_members_ldap2dolibarr.php commitiferror 1 --server=localhost -y; then
|
||||
echo ldap member update ok
|
||||
else
|
||||
echo ldap member update ended with error
|
||||
fi
|
||||
fi
|
||||
# if [ $member -eq 1 ];
|
||||
# then
|
||||
# if sudo php "$src_path/scripts/members/sync_members_ldap2dolibarr.php" commitiferror 1 --server=localhost -y; then
|
||||
# echo ldap member update ok
|
||||
# else
|
||||
# echo ldap member update ended with error
|
||||
# fi
|
||||
# fi
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Manage the various aspects of your business or association",
|
||||
"fr": "Gérez les différents aspects de votre activité pro ou associative"
|
||||
},
|
||||
"version": "16.0.1~ynh1",
|
||||
"version": "16.0.3~ynh1",
|
||||
"url": "https://www.dolibarr.org/",
|
||||
"upstream": {
|
||||
"license": "GPL-3.0-or-later",
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ ynh_abort_if_errors
|
|||
domain=$YNH_APP_ARG_DOMAIN
|
||||
path_url=$YNH_APP_ARG_PATH
|
||||
admin=$YNH_APP_ARG_ADMIN
|
||||
member=0
|
||||
#member=0
|
||||
#is_public=0
|
||||
phpversion=$YNH_PHP_VERSION
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain
|
|||
ynh_app_setting_set --app=$app --key=path --value=$path_url
|
||||
ynh_app_setting_set --app=$app --key=admin --value=$admin
|
||||
#ynh_app_setting_set --app=$app --key=is_public --value=$is_public
|
||||
ynh_app_setting_set --app=$app --key=member --value=$member
|
||||
#ynh_app_setting_set --app=$app --key=member --value=$member
|
||||
ynh_app_setting_set --app=$app --key=version --value=$(ynh_app_upstream_version "../manifest.json")
|
||||
|
||||
#=================================================
|
||||
|
|
@ -227,14 +227,6 @@ ynh_permission_update --permission="main" --remove="visitors"
|
|||
ynh_script_progression --message="configuring config file" --weight=1
|
||||
ynh_replace_string --match_string="dolibarr_main_authentication='dolibarr'" --replace_string="dolibarr_main_authentication='http'" --target_file="$final_path/htdocs/conf/conf.php"
|
||||
|
||||
#=================================================
|
||||
# CONFIGURE THE HOOK FILE FOR USER CREATE
|
||||
#=================================================
|
||||
fhook=../hooks/post_user_create
|
||||
ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$fhook"
|
||||
ynh_replace_string --match_string="__MEMBER__" --replace_string="$member" --target_file="$fhook"
|
||||
ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$fhook"
|
||||
|
||||
#=================================================
|
||||
# STORE THE CONFIG FILE CHECKSUM
|
||||
#=================================================
|
||||
|
|
@ -250,6 +242,12 @@ ynh_store_file_checksum --file="$final_path/htdocs/conf/conf.php"
|
|||
ynh_script_progression --message="Configuring permissions..." --weight=1
|
||||
|
||||
# Set permissions on app files
|
||||
if [ ! -f "$datadir/install.lock" ]; then
|
||||
echo 'This is a lock file to prevent use of install pages (set with permission 440)' > "$datadir/install.lock"
|
||||
chown $app:$app "$datadir/install.lock"
|
||||
chmod 440 "$datadir/install.lock"
|
||||
fi
|
||||
|
||||
chmod 750 "$final_path"
|
||||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
|
|||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||
admin=$(ynh_app_setting_get --app=$app --key=admin)
|
||||
member=$(ynh_app_setting_get --app=$app --key=member)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
language=$(ynh_app_setting_get --app=$app --key=language)
|
||||
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
||||
|
|
@ -275,6 +274,12 @@ EOF
|
|||
|
||||
done
|
||||
|
||||
if php$phpversion $final_path/scripts/user/sync_users_ldap2dolibarr.php commitiferror --server=localhost -y; then
|
||||
ynh_print_info --message="LDAP user update ok"
|
||||
else
|
||||
ynh_print_info --message="LDAP user update ended with error"
|
||||
fi
|
||||
|
||||
ynh_app_setting_set --app=$app --key=version --value=$update_version
|
||||
fi
|
||||
|
||||
|
|
@ -303,6 +308,12 @@ ynh_use_logrotate --non-append
|
|||
ynh_script_progression --message="Configuring permissions..." --weight=1
|
||||
|
||||
# Set permissions on app files
|
||||
if [ ! -f "$datadir/install.lock" ]; then
|
||||
echo 'This is a lock file to prevent use of install pages (set with permission 440)' > "$datadir/install.lock"
|
||||
chown $app:$app "$datadir/install.lock"
|
||||
chmod 440 "$datadir/install.lock"
|
||||
fi
|
||||
|
||||
chmod 750 "$final_path"
|
||||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
next_version="12.0.5"
|
||||
|
||||
# Dolibarr tarball checksum
|
||||
dolibarr_source_sha256="ba9b636b95caeba72106ae6a61f25654e113817759e69a6a30ed510882d0f309"
|
||||
dolibarr_source_sha256="b60b124ebcd294375f6200cc0683449e475b5dec687f8317b820fc8ec1413d21"
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Target version of the Dolibarr update
|
||||
next_version="16.0.0"
|
||||
next_version="16.0.3"
|
||||
|
||||
# Dolibarr tarball checksum
|
||||
dolibarr_source_sha256="76a642d74cd3e4fe86fdeccffacd0fa2b22a398dc03e7ad92edb34d033b17b2f"
|
||||
dolibarr_source_sha256="52010375412c780b378145633a4e18abf6bde4c8e89a4cc1ad56d98fcd6120fd"
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Target version of the Dolibarr update
|
||||
next_version="16.0.1"
|
||||
next_version="16.0.3"
|
||||
|
||||
# Dolibarr tarball checksum
|
||||
dolibarr_source_sha256="f3614cf7b08c80d1aed4ebe0434008b2b03867d12b85df45b682c217ecb16573"
|
||||
dolibarr_source_sha256="52010375412c780b378145633a4e18abf6bde4c8e89a4cc1ad56d98fcd6120fd"
|
||||
Loading…
Add table
Reference in a new issue