cleaning

scripts/install

@@ -52,12 +52,9 @@ SOURCE_IN_SUBDIR=true
 EOF
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_script_progression --message="Download source files..." --weight=70
+ynh_script_progression --message="Download source files..." --weight=10
 ynh_setup_source --dest_dir="$install_dir"
 
-# Create necessary files
-touch $install_dir/htdocs/conf/conf.php
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -76,107 +73,10 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="install.forced.php" --destination="$install_dir/htdocs/install/install.forced.php"
+ynh_add_config --template="../conf/conf.php" --destination="touch $install_dir/htdocs/conf/conf.php"
 
-#=================================================
-# 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
-
-ynh_script_progression --message="Generate fileconf" --weight=1
-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" > /var/log/$app/install1.html
-
-ynh_exec_fully_quiet sleep 5
-
-ynh_script_progression --message="installation - step 2 (may take a while)..." --weight=20
-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" > /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" > /var/log/$app/install4.html
-
-ynh_exec_fully_quiet sleep 5
-
-# 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
-
-# # Populate the database with YNH users.
-# 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"
-# else
-#         ynh_print_info --message="LDAP user update ended with error"
-# fi
-
-#=================================================
-# MODIFY A CONFIG FILE
-#=================================================
-ynh_script_progression --message="configuring config file" --weight=1
-
-# Setup HTTP auth in conf
-ynh_replace_string --match_string="dolibarr_main_authentication='dolibarr'" --replace_string="dolibarr_main_authentication='http'" --target_file="$install_dir/htdocs/conf/conf.php"
-
-#=================================================
-# STORE THE CONFIG FILE CHECKSUM
-#=================================================
-
-# Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum --file="$install_dir/htdocs/conf/conf.php"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-# Set permissions on app files
-# if [ ! -f "$data_dir/install.lock" ]; then
-# 	echo 'This is a lock file to prevent use of install pages (set with permission 440)' > "$data_dir/install.lock"
-# 	chown $app:$app "$data_dir/install.lock"
-# 	chmod 440 "$data_dir/install.lock"
-# fi
-
-chmod 750 "$install_dir"
 chmod 644 "$install_dir/htdocs/conf/conf.php"
-chmod -R o-rwx "$install_dir"
+chown $app:$app "$install_dir/htdocs/conf/conf.php"
-chown -R $app:www-data "$install_dir"
 
 #=================================================
 # SETUP LOGROTATE

scripts/remove

@@ -23,9 +23,6 @@ ynh_remove_fpm_config
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-# Remove a directory securely
-ynh_secure_remove --file="/etc/$app"
-
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 

scripts/restore

@@ -17,6 +17,18 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
+chown -R $app:www-data "$install_dir"
+
+#=================================================
+# RESTORE THE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Restoring the data directory..." --weight=1
+
+ynh_restore_file --origin_path="$data_dir" --not_mandatory
+
+# (Same as for install dir)
+chown -R $app:www-data "$data_dir"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
@@ -39,21 +51,6 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-# Set permissions on app files
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
-chmod 644 "$install_dir/htdocs/conf/conf.php"
-mkdir -p "$data_dir"
-chown -R $app: "$data_dir"
-chmod go-w $data_dir
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

scripts/upgrade

@@ -213,10 +213,6 @@ chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-mkdir -p "$data_dir"
-chown -R $app: "$data_dir"
-chmod go-w $data_dir
-
 #=================================================
 # END OF SCRIPT
 #=================================================