renamed SOLR roles

renamed solr roles to reflect versions in use, and added solr7 roles to enable solr7 installations. removal of defunct inventories & roles and fixed documentation references

README.md

@@ -35,9 +35,9 @@ ERROR: apache2_module is not a legal parameter in an Ansible task or handler.
 ```
 then you have an older version of Ansible.
 
-## Setup the ALA demo
+## Setup the Living Atlas demo
 
-Below are some instructions for setting up the [ALA demo](http://ala-demo.gbif.org) with Ansible & Vagrant on your local machine.
+Below are some instructions for setting up the Living Atlas demo with Ansible & Vagrant on your local machine or laptop.
 
 #### 1. Vagrant
 [Vagrant](http://www.vagrantup.com) can be used to test ansible playbooks on your local machine. To use this, you will need to install
@@ -114,7 +114,7 @@ Once completed successfully you can view the demo on http://demo.vagrant1.ala.or
 
 ## Installing the ALA demo on EC2 or other cloud providers
 
-There is an inventory you can use to setup the demo on a cloud provider [here](ansible/inventories/demo-ec2).
+There is an inventory you can use to setup the demo on a cloud provider [here](ansible/inventories/living-atlas).
 An Ubuntu 16 instance with 15GB of RAM and 4 CPUs is recommended. The scripts where tested on 30th April 2015 and took approximately 20 mins to run on a EC2 instance.
 
 Here are the steps to run with this inventory:
@@ -129,14 +129,13 @@ You'll need to replace "12.12.12.12" with the IP address of your newly created U
 
  * Run the following:
 ```
-ansible-playbook --private-key ~/.ssh/MyPrivateKey.pem --user ubuntu --become -i ansible/inventories/demo-ec2 ansible/ala-demo.yml
+ansible-playbook --private-key ~/.ssh/MyPrivateKey.pem --user ubuntu --become -i ansible/inventories/living-atlas ansible/ala-demo.yml
 ```
- * View http://ala-demo.org
+ * View http://living-atlas.org
 
 ##### That worked, now what do I do ?
  * Have a look at the [documentation](https://github.com/AtlasOfLivingAustralia/documentation/wiki/First-data-resource) and load a data resource.
- * Or, load occurrence data in CSV format into the application using the sandbox which can be found at [http://ala-demo.org/sandbox](http://ala-demo.org/sandbox) using your new VM.
-
+
 
 ### Vagrant
 

ansible/ala-demo.yml

@@ -14,7 +14,7 @@
     - postgresql
     - webserver
     - nameindex
-    - solr5
+    - solr6
     - logger-client
     - biocache-properties
     - { role: biocache-db,      use_cassandra3 : true }
@@ -25,7 +25,7 @@
     - { role: nameindexer,      ala_name_matching_version: "3.1" }
     - { role: logger-service,   logger_version: "2.3.5" }
     - { role: species-list,     specieslist_version: "3.0" }
-    - { role: bie-index,        bie_index_version: "1.4.2.2" }
+    - { role: bie-index,        bie_index_version: "1.4.1" }
     - { role: bie-hub,          bie_hub: ala-bie, bie_hub_version: "1.4.1" }
     - { role: image-service,    images_version: "0.9" }
-    - demo
+    - demo

ansible/inventories/ala-demo → ansible/inventories/living-atlas

@@ -1,16 +1,16 @@
-###############################################################################
+########################################################################################################################
 #
 # An inventory to use to set up a machine on EC2 or other cloud provider.
 # To use this add the following into your /etc/hosts file:
 #
-# 12.12.12.12	ala-demo	ala-demo.org
+# 12.12.12.12	living-atlas	living-atlas.org
 #
 # You'll need to replace "12.12.12.12" with the IP address of your newly created
-# Ubuntu 14 instance.
+# Ubuntu 16 instance. For this demo to run well, we recommend a machine of 16GB RAM, 4 CPUs.
 #
-# ansible-playbook --private-key ~/.ssh/MyPrivateKey.pem -u ubuntu -s -i ansible/inventories/ala-demo ansible/ala-demo-cassandra3-solr6.yml
+# ansible-playbook --private-key ~/.ssh/MyKey.pem -u ubuntu -s -i ansible/inventories/living-atlas ansible/ala-demo.yml
 #
-###############################################################################
+########################################################################################################################
 
 [ala-demo]
 living-atlas.org
@@ -93,9 +93,6 @@ downloads.fieldguideDownloadUrl =
 downloads.staticDownloadsUrl =
 downloads.termsOfUseUrl =
 
-
-
-
 ####################### Collectory ############################################
 
 collectory_hostname = living-atlas.org
@@ -173,7 +170,7 @@ solr_context_path = /solr
 solr_host = living-atlas.org
 solr_port = 8983
 
-solr_heap = 10g
+solr_heap = 8g
 
 sandbox_hostname = living-atlas.org
 sandbox_url = http://living-atlas.org/sandbox
@@ -268,4 +265,4 @@ images_base_url = http://living-atlas.org
 images_context_path = /images
 images_hostname = living-atlas.org
 images_db_password = images
-images_db_username = images
+images_db_username = images

ansible/inventories/vagrant/solr5-vagrant → ansible/inventories/vagrant/solr6-vagrant

@@ -1,7 +1,7 @@
-[solr5-server]
+[solr6-server]
 vagrant1
 
-[solr5-server:vars]
+[solr6-server:vars]
 is_vagrant=true
 local_repo_dir=~/.ala
 data_dir=/data

ansible/roles/biocache-db/files/cassandra/cassandra3-schema.txt

@@ -143,6 +143,7 @@ CREATE TABLE occ.occ (
     "abcdTypeStatus" text,
     "acceptedNameUsage" text,
     "acceptedNameUsageID" text,
+    "accessrights" text,
     "alaUserId" text,
     "associatedMedia" text,
     "associatedOccurrences" text,