# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1477061642 -7200
# Node ID 5598bad67f8d3008237528187174696f5edefb33
# Parent  82a3db4b1d394760549a8152fe46b52fb7bc9941
correct build process, post upgrade script and local .env provisioning

diff -r 82a3db4b1d39 -r 5598bad67f8d build/build_rpm.sh
--- a/build/build_rpm.sh	Fri Oct 21 16:07:19 2016 +0200
+++ b/build/build_rpm.sh	Fri Oct 21 16:54:02 2016 +0200
@@ -22,8 +22,6 @@
 echo "---> Launching packaging"
 rm -f *.rpm
 
-popd > /dev/null
-
 version=$(grep -oP "\'version\'\s*=>\s*\'\K[\.0-9]+(?=\')" /vagrant/root/var/www/corpusdelaparole/corpus-back/config/version.php)
 version=${version:-0.0.0}
 
@@ -52,3 +50,6 @@
     .
 
 echo "---> Packaging done"
+
+popd > /dev/null
+
diff -r 82a3db4b1d39 -r 5598bad67f8d build/post_upgrade.sh
--- a/build/post_upgrade.sh	Fri Oct 21 16:07:19 2016 +0200
+++ b/build/post_upgrade.sh	Fri Oct 21 16:54:02 2016 +0200
@@ -18,8 +18,6 @@
     php artisan optimize
     php artisan config:cache
     php artisan route:cache
-    php artisan view:cache
-
 
     echo "Correcting file permissions for back office"
     chgrp -R apache storage bootstrap/cache
diff -r 82a3db4b1d39 -r 5598bad67f8d dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb
--- a/dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb	Fri Oct 21 16:07:19 2016 +0200
+++ b/dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb	Fri Oct 21 16:54:02 2016 +0200
@@ -28,7 +28,7 @@
 
 EASYRDF_HTTP_CLIENT_TIMEOUT=5000
 
-ELASTICSEARCH_URL=<%= @elasticsearch_host %>:<%= @elasticsearch_port %>
+ELASTICSEARCH_URL=<%= @es_host %>:<%= @es_port %>
 ELASTICSEARCH_LOG_PATH='logs/elasticsearch.log'
 ELASTICSEARCH_INDEX='corpus'
 ELASTICSEARCH_SHARDS=1
diff -r 82a3db4b1d39 -r 5598bad67f8d server/src/database/migrations/2016_09_30_132045_create_geonames_hierarchies_table.php
--- a/server/src/database/migrations/2016_09_30_132045_create_geonames_hierarchies_table.php	Fri Oct 21 16:07:19 2016 +0200
+++ b/server/src/database/migrations/2016_09_30_132045_create_geonames_hierarchies_table.php	Fri Oct 21 16:54:02 2016 +0200
@@ -4,8 +4,6 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-use Illuminate\Support\Facades\DB;
-
 class CreateGeonamesHierarchiesTable extends Migration
 {
     /**