Merge from branch 1.3 to correct config path

This commit is contained in:
Michael RICOIS 2012-12-19 16:31:37 +00:00
commit a648fff7e5

View File

@ -17,8 +17,9 @@ set_include_path(implode(PATH_SEPARATOR, array(
)));
//Copy configuration
$configDir = realpath(dirname(__FILE__)).'/config';
$hostname = exec('echo $(hostname)');
passthru('cp -fv ./'.$hostname.'/application.ini '.APPLICATION_PATH.'/configs/application.ini');
passthru('cp -fv '. $configDir.'/'.$hostname.'/application.ini '.APPLICATION_PATH.'/configs/application.ini');
/** Zend_Application */
require_once 'Zend/Application.php';
@ -56,7 +57,7 @@ if(isset($opts->install))
//Création des répertoires
mkdir(APPLICATION_PATH . '/../data');
mkdir(APPLICATION_PATH . '/../data/sessions');
//Modification des permissions
passthru('chown -R www-data: '.APPLICATION_PATH.'/../');
passthru('chmod +x '.APPLICATION_PATH.'/../scripts/cron.php');