--- a/.hgignore	Tue Dec 15 10:40:00 2015 +0100
+++ b/.hgignore	Thu Jan 14 18:35:23 2016 +0100
@@ -37,3 +37,5 @@
 ^cms/app-client/tmp
 ^cms/corpus_module/app-client
 ^.*\.DS_Store
+^dev2/
+^build/

--- a/server/src/.env.example	Tue Dec 15 10:40:00 2015 +0100
+++ b/server/src/.env.example	Thu Jan 14 18:35:23 2016 +0100
@@ -27,7 +27,7 @@
 EASYRDF_HTTP_CLIENT_TIMEOUT=20
 
 ELASTICSEARCH_URL=
-ELASTICSEARCH_LOG_PATH='/logs/elasticsearch.log'
+ELASTICSEARCH_LOG_PATH='logs/elasticsearch.log'
 ELASTICSEARCH_INDEX='corpus'
-ELASTICSEARCH_SHARDS=5
-ELASTICSEARCH_REPLICAS=1
\ No newline at end of file
+ELASTICSEARCH_SHARDS=1
+ELASTICSEARCH_REPLICAS=1

--- a/server/src/app/Console/Commands/IndexDocuments.php	Tue Dec 15 10:40:00 2015 +0100
+++ b/server/src/app/Console/Commands/IndexDocuments.php	Thu Jan 14 18:35:23 2016 +0100
@@ -57,8 +57,8 @@
         }
         $indexParams['body'] = [
             'settings' => [
-                'number_of_shards' => env('ELASTICSEARCH_SHARDS'),
-                'number_of_replicas' => env('ELASTICSEARCH_REPLICAS'),
+                'number_of_shards' => conf('elasticsearch.shards'),
+                'number_of_replicas' => conf('elasticsearch.replicas'),
                 'index.mapping.ignore_malformed' => True
             ],
             'mappings' => [
@@ -97,7 +97,7 @@
     private function indexOne($doc)
     {
         $query_data = [
-            'index' => env('ELASTICSEARCH_INDEX'),
+            'index' => conf('elasticsearch.index'),
             'type' => 'document',
             'id' => (string)$doc->getId(),
             'body' => [
@@ -119,7 +119,7 @@
           foreach($docs as $doc){
               $query_data['body'][] = [
                   'index' => [
-                      '_index' => env('ELASTICSEARCH_INDEX'),
+                      '_index' => conf('elasticsearch.index'),
                       '_type' => 'document',
                       '_id' => (string)$doc->getId()
                   ]

--- a/server/src/config/elasticsearch.php	Tue Dec 15 10:40:00 2015 +0100
+++ b/server/src/config/elasticsearch.php	Thu Jan 14 18:35:23 2016 +0100
@@ -3,9 +3,10 @@
 use Monolog\Logger;
 
 return array(
-    'hosts' => array(
-                    env('ELASTICSEARCH_URL')
-                    ),
-    'logPath' => storage_path() . env('ELASTICSEARCH_LOG_PATH'),
-    'logLevel' => Logger::INFO
+    'hosts' => [env('ELASTICSEARCH_URL')],
+    'logPath' => storage_path('logs/'.env('ELASTICSEARCH_LOG_PATH', 'elasticsearch.log')),
+    'logLevel' => Logger::INFO,
+    'shards' => env('ELASTICSEARCH_SHARDS', 1),
+    'replicas' => env('ELASTICSEARCH_REPLICAS', 1),
+    'index' => env('ELASTICSEARCH_INDEX')
 );