mirror of
https://github.com/YunoHost-Apps/dolibarr_ynh.git
synced 2024-09-03 18:35:53 +02:00
revert some changes
This commit is contained in:
parent
6682eeedd4
commit
a48bd3ba01
1 changed files with 36 additions and 16 deletions
|
@ -28,7 +28,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1
|
|||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --source_id="main" --dest_dir="$install_dir"
|
||||
|
||||
chown -R "$app:www-data" "$install_dir"
|
||||
# Create necessary files
|
||||
touch $install_dir/htdocs/conf/conf.php
|
||||
|
||||
#=================================================
|
||||
# PREPARE AND INSTALL APP
|
||||
|
@ -43,7 +44,7 @@ ynh_add_config --template="install.forced.php" --destination="$install_dir/htdoc
|
|||
ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
|
||||
|
||||
# Create a dedicated php-fpm config
|
||||
ynh_add_fpm_config
|
||||
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
|
||||
|
||||
# Create a dedicated nginx config
|
||||
ynh_add_nginx_config
|
||||
|
@ -54,43 +55,62 @@ ynh_use_logrotate --logfile="$install_dir/documents/dolibarr.log"
|
|||
#=================================================
|
||||
# SETUP APPLICATION WITH CURL
|
||||
#=================================================
|
||||
|
||||
# Set right permissions for curl install
|
||||
chown -R "$app:" "$install_dir"
|
||||
|
||||
# Installation with curl
|
||||
|
||||
mkdir -p "/var/log/$app/"
|
||||
|
||||
ynh_script_progression --message="Finalizing installation..." --weight=1
|
||||
|
||||
# Create necessary files
|
||||
touch "$install_dir/htdocs/conf/conf.php"
|
||||
|
||||
ynh_script_progression --message="Generate fileconf" --weight=1
|
||||
ynh_local_curl "/install/fileconf.php" "testpost=ok"
|
||||
ynh_local_curl "/install/fileconf.php" \
|
||||
"testpost=ok"
|
||||
|
||||
ynh_exec_fully_quiet sleep 5
|
||||
|
||||
ynh_script_progression --message="installation - step 1" --weight=3
|
||||
ynh_local_curl "/install/step1.php" "testpost=ok" "action=set"
|
||||
ynh_local_curl "/install/step1.php" \
|
||||
"testpost=ok" \
|
||||
"action=set" > /var/log/$app/install1.html
|
||||
|
||||
ynh_exec_fully_quiet sleep 5
|
||||
|
||||
ynh_script_progression --message="installation - step 2 (may take a while)..." --weight=72
|
||||
ynh_local_curl "/install/step2.php" "testpost=ok" "action=set"
|
||||
ynh_local_curl "/install/step2.php" \
|
||||
"testpost=ok" \
|
||||
"action=set" > /var/log/$app/install2.html
|
||||
|
||||
ynh_exec_fully_quiet sleep 5
|
||||
|
||||
ynh_script_progression --message="installation - step 4" --weight=3
|
||||
ynh_local_curl "/install/step4.php" "testpost=ok" "action=set"
|
||||
ynh_local_curl "/install/step4.php" \
|
||||
"testpost=ok" \
|
||||
"action=set" > /var/log/$app/install3.html
|
||||
|
||||
ynh_exec_fully_quiet sleep 5
|
||||
|
||||
# Generate a random password for the admin user (will be ignored because of LDAP)
|
||||
password=$(ynh_string_random 8)
|
||||
|
||||
ynh_script_progression --message="installation - step 5" --weight=4
|
||||
ynh_local_curl "/install/step5.php" "testpost=ok" "action=set" "pass=$password" "pass_verif=$password"
|
||||
ynh_local_curl "/install/step5.php" \
|
||||
"testpost=ok" \
|
||||
"action=set" \
|
||||
"pass=$password" \
|
||||
"pass_verif=$password" > /var/log/$app/install4.html
|
||||
|
||||
ynh_exec_fully_quiet sleep 5
|
||||
|
||||
#=================================================
|
||||
# SETUP LDAP IN DATABASE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring LDAP" --weight=1
|
||||
ynh_script_progression --message="configuring LDAP" --weight=1
|
||||
|
||||
# Populate the LDAP parameters
|
||||
ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < ../conf/sql/ldap.sql
|
||||
ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap.sql
|
||||
|
||||
# Populate the database with YNH users.
|
||||
ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < ../conf/sql/ldap_user.sql
|
||||
ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap_user.sql
|
||||
|
||||
if php$phpversion $install_dir/scripts/user/sync_users_ldap2dolibarr.php commitiferror --server=localhost -y; then
|
||||
ynh_print_info --message="LDAP user update ok"
|
||||
|
|
Loading…
Reference in a new issue