Merge pull request #39 from tehranian/fix-upstart-conf

Fix the GOMAXPROCS warning for Upstart-based systems

CONTRIBUTORS

@@ -1,3 +1,4 @@
 Kyle Anderson <kyle@xkyle.com>
 Kenny Gatdula <kennygatdula@gmail.com>
-Simon Croome <simon@croome.org>
+Simon Croome <simon@croome.org>
+Dan Tehranian <tehranian@gmail.com>

spec/acceptance/standard_spec.rb

@@ -31,7 +31,7 @@ class { 'consul':
     end
 
     describe command('consul version') do
-      it { should return_stdout /Consul v0\.2\.0/ }
+      it { should return_stdout /Consul v0\.4\.1/ }
     end
 
   end

spec/acceptance/ui_spec.rb

@@ -29,7 +29,7 @@ class { 'consul':
     end
 
     describe file('/opt/consul/ui') do
-      it { should be_linked_to '/opt/consul/0.2.0_web_ui' }
+      it { should be_linked_to '/opt/consul/0.4.1_web_ui' }
     end
 
     describe service('consul') do
@@ -39,7 +39,7 @@ class { 'consul':
     it { should contain_service('mysql-server').with_ensure('present') }
 
     describe command('consul version') do
-      it { should return_stdout /Consul v0\.2\.0/ }
+      it { should return_stdout /Consul v0\.4\.1/ }
     end
 
   end

templates/consul.upstart.erb

@@ -6,7 +6,14 @@ stop on runlevel [06]
 env CONSUL=<%= scope.lookupvar('consul::bin_dir') %>/consul
 env CONFIG=<%= scope.lookupvar('consul::config_dir') %>
 
-exec sudo -u <%= scope.lookupvar('consul::user') %> -g <%= scope.lookupvar('consul::group') %> $CONSUL agent -config-dir $CONFIG <%= scope.lookupvar('consul::extra_options') %>
+
+script
+    # read settings like GOMAXPROCS from "/etc/default/consul", if available.
+    [ -e /etc/default/consul ] && . /etc/default/consul
+
+    export GOMAXPROCS=${GOMAXPROCS:-2}
+    exec sudo -u <%= scope.lookupvar('consul::user') %> -g <%= scope.lookupvar('consul::group') %> $CONSUL agent -config-dir $CONFIG <%= scope.lookupvar('consul::extra_options') %>
+end script
 
 respawn
 respawn limit 10 10