Merge branch 'master' of https://github.com/HBRGTech/daisy

HBRGTech · Nov 18, 2014 · 6ee63a0 · 6ee63a0
2 parents 0ad6210 + 148566d
commit 6ee63a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'compass', '~> 1.0.1'
+gem 'compass', '~> 0.12.7'
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
@@ -73,6 +73,14 @@
 	package { 'npm':
 		ensure => 'present'
 	}
+
+	exec { 'install bower':
+		command => '/usr/bin/npm install -g bower',
+		user => 'root',
+		timeout => 0,		
+		require => Package['npm'],
+		before => Exec['npm install']
+	}
 
 	exec { 'install grunt-cli':
 		command => '/usr/bin/npm install -g grunt-cli',