merging in geogig changes and other new changes needed for release 1.1

Author: smesdaghi

.kitchen.yml

@@ -23,14 +23,13 @@ suites:
       - recipe[rogue::gdal]
       - recipe[rogue::postgresql]
       - recipe[rogue]
-    attributes: {'tomcat':
-                   {'java_options':
-                      "-Djava.awt.headless=true -Xmx3g -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC"
-                   },
-                 'rogue':
-                   {
-                    'geoserver':{
-                      'url':'http://localhost:8080/geoserver/'
-                     }
-                 }
-    }
+    attributes: {
+      'tomcat': {
+        'java_options': "-Djava.awt.headless=true -Xmx3g -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC"
+           },
+       'rogue': {
+         'geoserver':{
+            'url':'http://localhost:8080/geoserver/'
+         }
+        }
+     }

README.md

@@ -27,11 +27,11 @@ Attributes
 - `node['rogue']['django_maploom']['auto_upgrade']` - Boolean. Determines whether to auto-upgrade the django-maploom version.
 - `node['rogue']['user']` = A hash with the username and password for the ROGUE user.
 - `node['rogue']['setup_db']` = Boolean.  Dictates whether the `rogue::database` recipe is executed.
-- `node['rogue']['geogit']['branch']` = The geogit branch to during the installation.
-- `node['rogue']['geogit']['build_from_source']` = Boolean.  If true, geogit will build from source code every provision, if false geogit will be downloaded from the `node['rogue']['geogit']['url']` location.
-- `node['rogue']['geogit']['global_configuration']` = A hash of hashes which represents geogit global configuration.
-- `node['rogue']['geogit']['location']` = The geogit installation location.
-- `node['rogue']['geogit']['url']` = The git repository url or zip file for geogit.
+- `node['rogue']['geogig']['branch']` = The geogig branch to during the installation.
+- `node['rogue']['geogig']['build_from_source']` = Boolean.  If true, geogig will build from source code every provision, if false geogig will be downloaded from the `node['rogue']['geogig']['url']` location.
+- `node['rogue']['geogig']['global_configuration']` = A hash of hashes which represents geogig global configuration.
+- `node['rogue']['geogig']['location']` = The geogig installation location.
+- `node['rogue']['geogig']['url']` = The git repository url or zip file for geogig.
 - `node['rogue']['geoserver']['use_db_client']` = Boolean.  If true, geoserver will use the database client in the geonode-geoserver extension to authenticate users.
 - `node['rogue']['geoserver']['url']` = The full url to Geoserver in ROGUE.
 - `node['rogue']['geoserver']['base_url']` = Geoserver's URL route in ROGUE.
@@ -74,6 +74,8 @@ Attributes
 - `node['rogue']['ssh']['public_key_remote_file']` = The location where to store the public key on the guest machine.
 - `node['rogue']['iface']` = The network interface used to obtain the ip.  Defaults to eth1 when the vagrant attribute is true, eth0 all other times.
 - `node['unison']['user']` = A hash with the username and password for the `unison` user.
+- `node['nginx']['client_max_body_size']` = The max body size for nginx.
+
 
 Usage
 -----
@@ -98,10 +100,10 @@ The fileservice recipe will:
 - Download the fileservice war and deploy it to Tomcat
 - Create a file-service-store in the Geoserver data directory, if it does not already exist
 
-#### rogue::geogit
-The geogit recipe will:
+#### rogue::geogig
+The geogig recipe will:
 
-- install geogit
+- install geogig
 
 #### rogue::geoserver
 The geoserver recipe will:

attributes/default.rb

@@ -1,5 +1,5 @@
 default['rogue']['debug'] = true
-default['rogue']['version'] = 'release-1.0'
+default['rogue']['version'] = 'release-1.1'
 default['rogue']['iface'] = 'eth0'
 
 if node.fetch('vagrant', false)
@@ -44,15 +44,14 @@
 default['rogue']['geoserver']['jai']['url'] = "http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64-jdk.bin"
 default['rogue']['geoserver']['jai_io']['url'] = "http://download.java.net/media/jai-imageio/builds/release/1.1/jai_imageio-1_1-lib-linux-amd64-jdk.bin"
 default['rogue']['geoserver']['url']= "http://#{node['rogue']['networking']['application']['fqdn']}#{node['rogue']['geoserver']['base_url']}/"
-default['rogue']['geoserver']['war'] = "http://jenkins.rogue.lmnsolutions.com/job/geoserver/lastSuccessfulBuild/artifact/geoserver_ext/target/geoserver.war"
 
 default['rogue']['geoserver_data']['url'] = 'https://github.com/ROGUE-JCTD/geoserver_data.git'
 default['rogue']['geoserver_data']['branch'] = 'master'
 default['rogue']['geonode']['location'] = '/var/lib/geonode/'
 default['rogue']['interpreter'] = ::File.join(node['rogue']['geonode']['location'], 'bin/python')
 default['rogue']['django_maploom']['auto_upgrade'] = true
 default['rogue']['django_maploom']['url'] = "git+https://github.com/ROGUE-JCTD/django-maploom.git#egg=django-maploom"
-default['rogue']['rogue_geonode']['branch'] = 'master'
+
 default['rogue']['rogue_geonode']['python_packages'] = ["uwsgi", "psycopg2"]
 default['rogue']['rogue_geonode']['location'] = File.join(node['rogue']['geonode']['location'], 'rogue_geonode')
 default['rogue']['rogue_geonode']['url'] = 'https://github.com/ROGUE-JCTD/rogue_geonode.git'
@@ -67,32 +66,31 @@
 default['rogue']['rogue_geonode']['settings']['OGC_SERVER']['LOCATION'] = node['rogue']['geoserver']['url']
 default['rogue']['rogue_geonode']['settings']['OGC_SERVER']['PUBLIC_LOCATION'] = node['rogue']['geoserver']['url']
 default['rogue']['rogue_geonode']['settings']['OGC_SERVER']['DATASTORE'] = ""
-default['rogue']['rogue_geonode']['settings']['OGC_SERVER']['GEOGIT_DATASTORE_DIR'] = ::File.join(node['rogue']['geoserver']['data_dir'], 'geogit')
+default['rogue']['rogue_geonode']['settings']['OGC_SERVER']['GEOGIG_DATASTORE_DIR'] = ::File.join(node['rogue']['geoserver']['data_dir'], 'geogig')
 default['rogue']['rogue_geonode']['settings']['OGC_SERVER']['USER'] = "admin"
 default['rogue']['rogue_geonode']['settings']['OGC_SERVER']['PASSWORD'] = "geoserver"
 default['rogue']['rogue_geonode']['settings']['UPLOADER']['BACKEND'] = 'geonode.importer'
 default['rogue']['rogue_geonode']['settings']['STATIC_ROOT'] = '/var/www/rogue'
 default['rogue']['rogue_geonode']['settings']['MEDIA_ROOT'] = '/var/www/rogue/media'
 default['rogue']['nginx']['locations'] = {}
+default['nginx']['client_max_body_size']='150M'
 
 default['rogue']['rogue_geonode']['settings']['DATABASES'] = {
     :default=>{:name=>'geonode', :user=>'geonode', :password=>'geonode', :host=>'rogue-database', :port=>'5432'},
     :geonode_imports=>{:name=>'geonode_imports', :user=>'geonode', :password=>'geonode', :host=>'rogue-database', :port=>'5432'}
     }
-default['rogue']['geogit']['build_from_source'] = false
-default['rogue']['geogit']['branch'] = 'SprintRelease'
+default['rogue']['geogig']['build_from_source'] = false
+default['rogue']['geogig']['branch'] = 'SprintRelease'
 
-if node['rogue']['geogit']['build_from_source']
-  default['rogue']['geogit']['url'] = 'https://github.com/ROGUE-JCTD/GeoGit.git'
-else
-  default['rogue']['geogit']['url'] = 'http://jenkins.rogue.lmnsolutions.com/job/geogit/lastSuccessfulBuild/artifact/src/cli-app/target/geogit-cli-app.zip'
+if node['rogue']['geogig']['build_from_source']
+default['rogue']['geogig']['url'] = 'https://github.com/locationtech/geogig.git'
 end
 
-default['rogue']['geogit']['global_configuration'] = {"user"=> {"name"=>"rogue",
+default['rogue']['geogig']['global_configuration'] = {"user"=> {"name"=>"rogue",
                                                                 "email"=>"[email protected]"},
                                                       "bdbje"=> {"object_durability"=>"safe"}
                                                       }
-default['rogue']['geogit']['location'] = '/var/lib/geogit'
+default['rogue']['geogig']['location'] = '/var/lib/geogig'
 
 
 default['rogue']['geoeserver-exts']['branch'] = '2.4.x'
@@ -112,17 +110,15 @@
 default['rogue']['rogue-scripts']['location'] = '/opt/rogue-scripts'
 default['rogue']['rogue-scripts']['url'] = 'https://github.com/ROGUE-JCTD/rogue-scripts.git'
 
-if node['rogue']['version'] == 'release-1.0'
-  default['rogue']['rogue_geonode']['branch'] = 'release-1.0'
-  default['rogue']['geoserver_data']['branch'] = 'release-1.0'
-  default['rogue']['django_maploom']['auto_upgrade'] = false
-  default['rogue']['geoserver']['war'] = "http://jenkins.rogue.lmnsolutions.com/userContent/geoshape-1.x/geoserver.war"
+default['rogue']['rogue_geonode']['branch'] = 'release-1.1'
+default['rogue']['geoserver_data']['branch'] = 'release-1.1'
+default['rogue']['django_maploom']['auto_upgrade'] = false
+default['rogue']['geoserver']['war'] = "http://jenkins.rogue.lmnsolutions.com/userContent/geoshape-2.x/geoserver.war"
+default['rogue']['geogig']['url'] = 'http://jenkins.rogue.lmnsolutions.com/userContent/geoshape-2.x/geogig-cli-app-1.0.zip'
 
-  if node['rogue']['geogit']['build_from_source']
-    default['rogue']['geogit']['url'] = 'https://github.com/boundlessgeo/GeoGig.git'
-    default['rogue']['geogit']['branch'] = '0.10.x'
-  else
-    default['rogue']['geogit']['url'] = 'http://jenkins.rogue.lmnsolutions.com/userContent/geoshape-1.x/geogit-cli-app-0.1.zip'
-  end
+default['rabbitmq']['rogue_user'] = {
+        :name => 'geoshape',
+        :password => 'geoshape',
+        :rights =>[{ :vhost => nil, :conf => '.*', :write => '.*', :read => '.*' }]
+  }
 
-end

metadata.rb

@@ -3,17 +3,18 @@
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version          '0.1.4'
 
-depends 'nginx', '~> 1.7.0'
-depends 'apt', '~> 2.1.1'
+depends 'nginx', '~> 2.7.4'
+depends 'apt', '~> 2.2'
 depends 'build-essential', '~> 2.0.0'
 depends 'git', '~> 2.6.0'
 depends 'python', '~> 1.4.2'
 depends 'openssl', '~> 1.1.0'
-depends 'ohai', '~> 1.1.12'
+depends 'ohai', '~> 2.0'
 depends 'hostsfile', '~> 2.4.1'
 depends 'database', '~> 2.1.2'
 depends 'java','~> 1.22.0'
 depends 'tomcat', '~> 0.15.2'
 depends 'postgresql', '~> 3.3.4'
 depends 'supervisord', '~> 1.0.1'
-depends 'runit','~> 1.5.10'
+depends 'runit','~> 1.5.10'
+depends 'rabbitmq', '~> 3.6.0'

providers/geonode.rb

@@ -7,7 +7,7 @@ def whyrun_supported?
 
 use_inline_resources
 
-def django_command(cmd, options)
+def django_command(cmd, options=[])
   "#{new_resource.virtual_env_location}bin/python manage.py #{cmd} #{options.join(' ')}"
 end
 
@@ -68,6 +68,15 @@ def local_settings(template_variables={})
       action :create
     end
 
+    osgeo_library = '/usr/lib/python2.6/dist-packages/'
+    site_packages = ::File.join(new_resource.virtual_env_location, 'lib/python2.7/site-packages/')
+
+    bash "add_virtual_path" do
+      code "echo #{osgeo_library} > #{site_packages}_virtualenv_path_extensions.pth"
+      #only_if { ::File.exists? osgeo_library and !::File.exists? ::File.join(site_packages, '_virtualenv_path_extensions.pth')}
+      cwd site_packages
+    end
+
     bash "downgrade_pip" do
       code "#{new_resource.virtual_env_location}/bin/easy_install pip==1.4.1"
     end
@@ -138,6 +147,14 @@ def local_settings(template_variables={})
     supervisord_program 'rogue' do
       name 'rogue'
       command "#{new_resource.virtual_env_location}bin/uwsgi --ini #{new_resource.rogue_geonode_location}/django.ini"
+      autorestart true
+      action :supervise
+    end
+
+    supervisord_program 'rogue-celery' do
+      name 'rogue-celery'
+      command "service celeryd start"
+      autorestart true
       action :supervise
     end
 
@@ -146,9 +163,8 @@ def local_settings(template_variables={})
 
 action :sync_db do
   execute "sync_db_#{new_resource.rogue_geonode_location}" do
-    command django_command('syncdb', ['--all', '--noinput'])
+    command django_command('syncdb', ['--noinput'])
     cwd new_resource.rogue_geonode_location
-    not_if "cd #{new_resource.rogue_geonode_location} && #{django_command('dumpdata', ['security'])}"
   end
 
   new_resource.updated_by_last_action(true)
@@ -165,7 +181,8 @@ def local_settings(template_variables={})
   execute "load_data_#{new_resource.name}" do
     command django_command('loaddata', new_resource.fixtures)
     cwd new_resource.rogue_geonode_location
-    not_if { new_resource.fixtures.empty? }
+    only_if { new_resource.fixtures }
+    ignore_failure true
   end
   new_resource.updated_by_last_action(true)
 end
@@ -181,6 +198,12 @@ def local_settings(template_variables={})
 action :start do
     execute "start_rogue" do
       command 'supervisorctl start rogue'
+      not_if "supervisorctl status rogue | grep RUNNING"
+    end
+
+    execute "start_rogue-celery" do
+      command 'supervisorctl start rogue-celery'
+      not_if "supervisorctl status rogue-celery | grep RUNNING"
     end
 end
 

recipes/celery.rb

@@ -0,0 +1,14 @@
+template "/etc/default/celeryd" do
+  source "celery/config.erb"
+  mode 0755
+end
+
+template "/etc/init.d/celeryd" do
+  source "celery/init.erb"
+  mode 0755
+end
+
+service "celeryd" do
+  supports :start => true, :stop => true, :restart => true
+  action :enable
+end