From b886b052f047b155476c9361dd3687175ffdc01d Mon Sep 17 00:00:00 2001 From: Mathieu Decoene Date: Thu, 4 Jun 2015 12:21:05 +0100 Subject: [PATCH] Disable production builds for development server --- environments/dev/hiera/common.json | 1 - environments/local/hiera/common.json | 1 - modules/ui/manifests/init.pp | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/environments/dev/hiera/common.json b/environments/dev/hiera/common.json index b7fb587..70e1844 100644 --- a/environments/dev/hiera/common.json +++ b/environments/dev/hiera/common.json @@ -67,5 +67,4 @@ /* Apache directives */ "ghservice::apache::version": "", "ghservice::apache::enable_basic_auth": "true" - } diff --git a/environments/local/hiera/common.json b/environments/local/hiera/common.json index a0f8b0a..1e65891 100644 --- a/environments/local/hiera/common.json +++ b/environments/local/hiera/common.json @@ -61,5 +61,4 @@ /* Apache directives */ "ghservice::apache::version": "", "ghservice::apache::enable_basic_auth": "false" - } diff --git a/modules/ui/manifests/init.pp b/modules/ui/manifests/init.pp index 99866ed..661e5bd 100644 --- a/modules/ui/manifests/init.pp +++ b/modules/ui/manifests/init.pp @@ -10,8 +10,8 @@ # Create a command for generating the production build $production_build_cmd = hiera('do_production_build') ? { 'true' => 'npm install -d && node ./node_modules/.bin/grunt', - 'false' => './etc/scripts/compileCSS.sh', - default => 'true', + 'false' => 'npm install -d && node ./node_modules/.bin/grunt exec:compileCSS', + 'default' => true } class { "::ui::install::${install_method}":