diff --git a/.gitignore b/.gitignore index 5b043ee..021f26d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ .DS_Store /.ssh /.viminfo -/.bash_history +/.bash* +/.profile /.gitconfig /.mysql_history +/.my.cnf +/.cache +/.config +/.local _DOCS diff --git a/conf/settings.php b/conf/settings.php index 82c05e2..29cc3d6 100644 --- a/conf/settings.php +++ b/conf/settings.php @@ -34,11 +34,11 @@ date_default_timezone_set(DATE_TIME_ZONE); // ROOT DIR PATH & PUBLIC HTML RACINE URLS //////////////////////////// //////////////////////////////////////////////////////////////////////// -$GLOBALS['ONLINE_PUBLIC_HTML_URL'] = 'https://paniers.zionetrix.net/'; -$GLOBALS['ONLINE_PUBLIC_HTML_ADMIN_URL'] = 'https://admin.paniers.zionetrix.net/'; +$GLOBALS['ONLINE_PUBLIC_HTML_URL'] = 'https://ptitefourmi.pixap.fr/'; +$GLOBALS['ONLINE_PUBLIC_HTML_ADMIN_URL'] = 'https://ptitefourmi.pixap.fr/'; if(ONLINE_REPOSITORY) { - define('ROOT_DIR_PATH', '/var/www/paniers/'); + define('ROOT_DIR_PATH', realpath(dirname(__FILE__).'/../')."/"); define('PUBLIC_HTML_ADMIN', $GLOBALS['ONLINE_PUBLIC_HTML_ADMIN_URL']); } else { @@ -63,9 +63,9 @@ if(!file_exists(TMP_DIR)) mkdir(TMP_DIR); $GLOBALS['db_admin'] = array( 'type' => "mysql", - 'db' => 'paniers', - 'user' => 'paniers_admin', - 'pwd' => 'QUyiO1hGELIa_Weq', + 'db' => 'ptitefourmi', + 'user' => 'ptitefourmi', + 'pwd' => 'ohyeivoo6ohkae4ThohShae9xailae7eikoaj2le', 'host' => 'localhost', 'man' => false );