madAndroid

if File.file?('Vagrantfile') and File.symlink?('../Vagrantfile')
    puts
    puts "I found a Vagrantfile here, and a symlink in the parent " +
        "folder - you probably want to do 'cd ..' and run the " +
        "command again.\n"
    puts
    exit -1
end

def sf_vagrant_config( config, version )

madAndroid

@@ -135,24 +135,30 @@ define sf_squid::firewall_allow::service ( $source = undef ) {
      }
 }
 define sf_squid::firewall_allow::output ( $destination = undef ) {
+
+    $uid = sf_get_uid($sf_squid::params::user)
+
     sf_firewall::basic { "00080 ${title}":
         proto       => 'tcp',
         dport       => '80',

madAndroid

 INFO global: Vagrant version: 1.2.2
 INFO manager: Registered plugin: VirtualBox provider
 INFO manager: Registered plugin: kernel
 INFO manager: Registered plugin: kernel
 INFO manager: Registered plugin: Arch guest
 INFO manager: Registered plugin: RedHat guest
 INFO manager: Registered plugin: SUSE guest
 INFO manager: Registered plugin: Gentoo guest
 INFO manager: Registered plugin: Ubuntu guest
 INFO manager: Registered plugin: Fedora guest

madAndroid

[   81s] [182/182] installing gettext-devel-0.17-16.el6
[   82s] removing nis flags from /var/tmp/build-root/etc/nsswitch.conf...
[   82s] now finalizing build dir...
[   82s] -----------------------------------------------------------------
[   82s] ----- building nxlog-ce.spec (user abuild)
[   82s] -----------------------------------------------------------------
[   82s] -----------------------------------------------------------------
[   83s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature /home/abuild/rpmbuild/SOURCES/nxlog-ce.spec
[   83s] warning: line 13: prereq is deprecated: Prereq(post,preun):    /sbin/install-info
[   83s] Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.ibX15J

madAndroid

diff --git a/puppet/scalefactory.com/modules/sf_defaults/manifests/puppet.pp b/puppet/scalefactory.com/modules/sf_defaults/manifests/puppet.pp
index 9af67cc..3fd023c 100644
--- a/puppet/scalefactory.com/modules/sf_defaults/manifests/puppet.pp
+++ b/puppet/scalefactory.com/modules/sf_defaults/manifests/puppet.pp
@@ -3,9 +3,53 @@
 class sf_defaults::puppet {
 
     include sf_defaults::puppet::monitoring
+    include sf_defaults::puppet::packages
 

madAndroid

# Copyright 2012-2013 The Scale Factory Limited. All rights reserved.

begin
    require 'json'
    require 'net/http'
rescue LoadError
    retry if require 'rubygems'
    raise
end

madAndroid

# Copyright 2012-2013 The Scale Factory Limited. All rights reserved.

begin
    require 'json'
    require 'net/http'
rescue LoadError
    retry if require 'rubygems'
    raise
end

madAndroid

diff --git a/puppet/scalefactory.com/modules/sf_activemq/templates/activemq.xml b/puppet/scalefactory.com/modules/sf_activemq/templates/activemq.xml
index 1cf1439..8821337 100644
--- a/puppet/scalefactory.com/modules/sf_activemq/templates/activemq.xml
+++ b/puppet/scalefactory.com/modules/sf_activemq/templates/activemq.xml
@@ -15,7 +15,7 @@
     <!-- 
         The <broker> element is used to configure the ActiveMQ broker. 
     -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="<%= broker_name %>" dataDirectory="${activemq.base}/data" <% if @operatingsystem != 'Debian' %>destroyApplicationContextOnStop="true"<% end 
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="<%= broker_name %>" dataDirectory="${activemq.base}/data">

madAndroid

diff --git a/sf-bootstrap b/sf-bootstrap
index f39cb77..b9e0343 100755
--- a/sf-bootstrap
+++ b/sf-bootstrap
@@ -452,10 +452,14 @@ class BootstrapBase
     def add_automation_to_path
 
         log_info( "Writing default path to /etc/environment" )
-        File.open( '/etc/environment', 'a' ) { |f|
-            f.puts "# Written by sf-bootstrap"

madAndroid

diff --git a/puppet/scalefactory.com/modules/sf_defaults/lib/facter/sf_cucumber_vagrant.rb b/puppet/scalefactory.com/modules/sf_defaults/lib/facter/sf_cucumber_vagrant.rb
new file mode 100644
index 0000000..7c04456
--- /dev/null
+++ b/puppet/scalefactory.com/modules/sf_defaults/lib/facter/sf_cucumber_vagrant.rb
@@ -0,0 +1,21 @@
+# Copyright 2012-2013 The Scale Factory Limited. All rights reserved.
+
+# Check if puppet running inside a vagrant box
+