Merge branch 'master' of ssh://rhea.netlor.fr:2222/monarc/MonarcAppFO

pull/8/head
Guillaume Lesniak 2017-05-05 10:49:21 +02:00
commit c6bd1a4894
2 changed files with 4 additions and 2 deletions

View File

@ -130,8 +130,7 @@ project and you should be ready to go! It should look something like below:
<Directory /path/to/monarc/public> <Directory /path/to/monarc/public>
DirectoryIndex index.php DirectoryIndex index.php
AllowOverride All AllowOverride All
Order allow,deny Require all granted
Allow from all
</Directory> </Directory>
</VirtualHost> </VirtualHost>

View File

@ -13,6 +13,9 @@ $datapath = "data";
if( ! empty($appconfdir) ){ if( ! empty($appconfdir) ){
$confpaths[] = $appconfdir.'/local.php'; $confpaths[] = $appconfdir.'/local.php';
$datapath = $appconfdir.'/data'; $datapath = $appconfdir.'/data';
if(!is_dir($datapath.'/cache')){
mkdir($datapath.'/cache');
}
} }
return array( return array(