ubuntu 14.04 changes.

Berksfile

@@ -1,3 +1,3 @@
 source 'https://api.berkshelf.com'
-cookbook 'rogue', :git => "https://github.com/ROGUE-JCTD/rogue-cookbook.git", :ref => "master"
-cookbook 'fail2ban', '~> 2.2.1'
+cookbook 'rogue', :git => "https://github.com/ROGUE-JCTD/rogue-cookbook.git", :ref => "U1404"
+cookbook 'fail2ban'

Vagrantfile

@@ -23,12 +23,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "trusty64"
 
   # Install RVM, Ruby and Chef on the Virtual Machine.
-  config.vm.provision :shell, :path => "scripts/install_rvm.sh",  :args => "stable"
-  config.vm.provision :shell, :path => "scripts/install_ruby.sh", :args => "1.9.3"
+##  config.vm.provision :shell, :path => "scripts/install_rvm.sh",  :args => "stable"
+##  config.vm.provision :shell, :path => "scripts/install_ruby.sh", :args => "1.9.3"
   unless BERKSHELF
-    config.vm.provision :shell, :path => "scripts/geoshape-install.sh", :args => "vagrant release-1.4"
+    config.vm.provision :shell, :path => "scripts/geoshape-install.sh", :args => "vagrant U1404"
   end
-  config.vm.provision :shell, :inline => "gem install chef --version 11.10.4 --no-rdoc --no-ri --conservative"
+##  config.vm.provision :shell, :inline => "gem install chef --version 11.10.4 --no-rdoc --no-ri --conservative"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
@@ -84,35 +84,35 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # some recipes and/or roles.
   #
 
-  if BERKSHELF
-    config.berkshelf.enabled = true
-    config.vm.provision :chef_solo do |chef|
-      chef.provisioning_path = "/opt/vagrant-chef"
-      chef.cookbooks_path = "cookbooks"
-      #chef.roles_path = "roles"
-      #chef.data_bags_path = "data_bags"
-      chef.add_recipe "apt"
-      chef.add_recipe "python"
-      chef.add_recipe "git"
-      chef.add_recipe "rogue::postgresql"
-      chef.add_recipe "rogue"
-
-    #chef.add_role "web"
-
-    # You may also specify custom JSON attributes:
-      chef.json={'vagrant'=>true}
-
-    ## pull the sprint release branch of geogit and use maploom instead of salamati    
-#    chef.json={
-#      'vagrant' => true,
-#      'rogue' => {
-#        'geogit' => {'branch' => 'SprintRelease'},
-#        'rogue_geonode' => {'branch' => 'maploom'}
-#       },
-#      'tomcat'=>{'java_options' => "-Djava.awt.headless=true -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC"}
-#    }     
-
-    end
+##  if BERKSHELF
+##    config.berkshelf.enabled = true
+##    config.vm.provision :chef_solo do |chef|
+##      chef.provisioning_path = "/opt/vagrant-chef"
+##      chef.cookbooks_path = "cookbooks"
+##      #chef.roles_path = "roles"
+##      #chef.data_bags_path = "data_bags"
+##      chef.add_recipe "apt"
+##      chef.add_recipe "python"
+##      chef.add_recipe "git"
+##      chef.add_recipe "rogue::postgresql"
+##      chef.add_recipe "rogue"
+##
+##    #chef.add_role "web"
+##  
+##    # You may also specify custom JSON attributes:
+##      chef.json={'vagrant'=>true}
+##     
+##    ## pull the sprint release branch of geogit and use maploom instead of salamati    
+###    chef.json={
+###      'vagrant' => true,
+###      'rogue' => {
+###        'geogit' => {'branch' => 'SprintRelease'},
+###        'rogue_geonode' => {'branch' => 'maploom'}
+###       },
+###      'tomcat'=>{'java_options' => "-Djava.awt.headless=true -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC"}
+###    }     
+##
+##    end
   end
 
   # Enable provisioning with chef server, specifying the chef server URL,
@@ -137,4 +137,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # chef-validator, unless you changed the configuration.
   #
   #   chef.validation_client_name = "chef-validator"
-end
+##end

roles/geoshape_core.json.bak

@@ -0,0 +1,11 @@
+{
+  "name": "geoshape_core",
+  "chef_type": "role",
+  "json_class": "Chef::Role",
+  "description": "Core GeoSHAPE Settings",
+  "run_list": [
+    "role[geoshape_base]",
+    "recipe[rogue::postgresql]",
+    "recipe[rogue]"
+  ]
+}