diff --git a/conf/conf.php b/conf/conf.php deleted file mode 100644 index f296192..0000000 --- a/conf/conf.php +++ /dev/null @@ -1,26 +0,0 @@ -$dolibarr_main_document_root="__INSTALL_DIR__/htdocs"; -$dolibarr_main_data_dir="__DATA_DIR__"; -$dolibarr_main_url_root="http://__DOMAIN____PATH__"; -$dolibarr_main_db_type="mysqli"; -$dolibarr_main_db_host="localhost"; -$dolibarr_main_db_port="3306"; -$dolibarr_main_db_name="__DB_NAME__"; -$dolibarr_main_db_user="__DB_USER__"; -$dolibarr_main_db_pass="__DB_PWD__"; - - -// Authentication settings -//$dolibarr_main_authentication='dolibarr'; - -$dolibarr_main_authentication='ldap,dolibarr,http'; -$dolibarr_main_auth_ldap_host='ldap:localhost'; -$dolibarr_main_auth_ldap_port='389'; -$dolibarr_main_auth_ldap_version='3'; -$dolibarr_main_auth_ldap_servertype='openldap'; -$dolibarr_main_auth_ldap_login_attribute='uid'; // Ex: uid or samaccountname for active directory -$dolibarr_main_auth_ldap_dn='ou=users,dc=yunohost,dc=org'; -$dolibarr_main_auth_ldap_filter = '&(objectClass=posixAccount)'; - -//$dolibarr_main_auth_ldap_admin_login='uid=admin,dc=yunohost,dc=org'; -//$dolibarr_main_auth_ldap_admin_pass='secret'; -//$dolibarr_main_auth_ldap_debug='false'; diff --git a/conf/install.forced.php b/conf/install.forced.php index ac2d9b5..78aecd9 100644 --- a/conf/install.forced.php +++ b/conf/install.forced.php @@ -25,7 +25,7 @@ $force_install_noedit = 2; $force_install_message = 'Welcome to your Dolibarr install'; /** @var string Data root absolute path (documents folder) */ -$force_install_main_data_root = null; +$force_install_main_data_root = '__DATA_DIR__'; /** @var bool Force HTTPS */ $force_install_mainforcehttps = true; @@ -34,7 +34,7 @@ $force_install_mainforcehttps = true; $force_install_database = '__DB_NAME__'; /** @var string Database driver (mysql|mysqli|pgsql|mssql|sqlite|sqlite3) */ -$force_install_type = 'mysql'; +$force_install_type = 'mysqli'; /** @var string Database server host */ $force_install_dbserver = 'localhost'; diff --git a/scripts/install b/scripts/install index 8a30c1a..b3120f7 100644 --- a/scripts/install +++ b/scripts/install @@ -56,7 +56,6 @@ ynh_script_progression --message="Download source files..." --weight=70 ynh_setup_source --dest_dir="$install_dir" # Create necessary files -data_dir=$install_dir/documents touch $install_dir/htdocs/conf/conf.php #================================================= @@ -105,7 +104,7 @@ ynh_local_curl "/install/step1.php" \ ynh_exec_fully_quiet sleep 5 -ynh_script_progression --message="installation - step 2 (may take a while)..." --weight=72 +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 @@ -175,14 +174,10 @@ ynh_script_progression --message="Configuring permissions..." --weight=1 # fi chmod 750 "$install_dir" +chmod 644 "$install_dir/htdocs/conf/conf.php" 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 - #================================================= # SETUP LOGROTATE #=================================================