Merge branch 'master' into udatp

Author: Matt Bertrand

.travis.yml

@@ -1,26 +1,23 @@
 language: python
 
 sudo: required
-
-addons:
-  apt:
-    packages:
-      - python-dev
-      - libgdal1-dev
+dist: trusty
 
 python:
   - "2.7"
 
 before_install:
+  - sudo add-apt-repository ppa:ubuntugis/ppa -y
   - sudo apt-get -qq update
+  - sudo apt-get install python-dev libgdal1-dev gdal-bin
 
 install:
   - export CPLUS_INCLUDE_PATH=/usr/include/gdal
   - export C_INCLUDE_PATH=/usr/include/gdal
   - pip install -r dev-requirements.txt
   - pip install -e .
   - git clone -b 2.4.x https://github.com/GeoNode/geonode.git
-  - cp local_settings.py geonode/geonode/.
+  - cp local_settings.py.template geonode/geonode/local_settings.py
   - pip install -e geonode
 
 script:

ansible/roles/common/tasks/main.yml

@@ -1,5 +1,9 @@
 ---
 
+- name: get UbuntuGIS repository
+  apt_repository: repo='ppa:ubuntugis/ppa'
+  sudo: yes
+
 - name: ensure apt cache is up to date
   apt: update_cache=yes
   sudo: yes

ansible/roles/dataqs/tasks/geoserver_permissions.yml

@@ -1,7 +1,7 @@
 - name: reset geoserver owner
-  command: chown -R tomcat7:tomcat7 /var/lib/tomcat7/webapps/geoserver/data
+  command: chown -R tomcat7:vagrant '/data/geodata'
   sudo: yes
 
 - name: reset geoserver permissions
-  command: chmod -R g+rws /var/lib/tomcat7/webapps/geoserver/data
+  command: chmod -R g+rws '/data/geodata/'
   sudo: yes

ansible/roles/dataqs/tasks/main.yml

@@ -29,8 +29,8 @@
   file: path=/home/{{deploy_user}}/epigeonode state=directory mode=1775 owner={{deploy_user}} group=tomcat7
   sudo: yes
 
-- name: create geoserver data directory
-  file: path=/var/lib/tomcat7/webapps/geoserver/data recurse=yes owner=tomcat7 group=tomcat7 state=directory mode=g+rws
+- name: Create temp data directory
+  file: path=/data/tmp state=directory mode=1775 owner={{deploy_user}} group=tomcat7
   sudo: yes
 
 - include: geoserver_permissions.yml
@@ -92,10 +92,6 @@
   command: "{{ app_code_dir }}/venvs/geonode/bin/python {{app_code_dir}}/venvs/geonode/src/dataqs/dataqs/gistemp/gistemp.py"
   ignore_errors: yes
 
-- name: create geoserver data directory
-  file: path=/var/lib/tomcat7/webapps/geoserver/data/data/geonode/forecast_io_airtemp recurse=yes owner=tomcat7 group=tomcat7 state=directory mode=774
-  sudo: yes
-
 - include: geoserver_permissions.yml
 
 - name: Create the forecastio coverage store

ansible/roles/dataqs/templates/dataq_settings.py

@@ -60,11 +60,11 @@
 GPM_ACCOUNT = 'your_gpm_email_account'
 
 # Location of GeoServer data directory
-GS_DATA_DIR = '/var/lib/tomcat7/webapps/geoserver/data'
+GS_DATA_DIR = '/data/geodata/data'
 
 # Directory where temporary data_queues geoprocessing files should
 # be downloaded
-GS_TMP_DIR = '/tmp'
+GS_TMP_DIR = '/data/tmp'
 
 # Time to wait before updating Geoserver mosaic (keep at 0 unless Geoserver
 # is on a different server.

ansible/roles/geoserver/tasks/main.yml

@@ -1,17 +1,18 @@
 ###
-# Install GeoServer from Custom GeoNode Build 
+# Install GeoServer from Custom GeoNode Build
 #
 ---
 
 - name: ensure apt cache is up to date
   apt: update_cache=yes
   sudo: yes
 
-- name: install Tomcat 
+- name: install Tomcat
   apt: pkg={{ item }} state=present
   sudo: yes
   with_items:
    - tomcat7
+   - unzip
 
 - name: copy the Tomcat setenv.sh file to /usr/share/tomcat7/bin
   template: src=setenv.sh dest=/usr/share/tomcat7/bin/setenv.sh
@@ -21,16 +22,45 @@
   template: src=tomcat7 dest=/etc/default/tomcat7
   sudo: yes
 
+- name: Create Geoserver data directory
+  file: path=/data/ state=directory
+  sudo: yes
+
 - name: Download Geoserver (remote)
   sudo: yes
   get_url:
-    dest=/var/lib/tomcat7/webapps/geoserver.war
+    dest=/tmp/geoserver.war
     url={{ geoserver_url }}
     owner=0
     group=0
     mode=0644
 
+- name: Unzip Geoserver WAR file
+  command: unzip -o -d '/tmp/geoserver' '/tmp/geoserver.war'
+  sudo: yes
+
+- name: Copy Geoserver web.xml file with custom data directory
+  template: src=web.xml dest=/tmp/geoserver/WEB-INF/web.xml
+  sudo: yes
+
+- name: Move data files
+  command: mv -n '/tmp/geoserver/data' '/data/geodata'
+  sudo: yes
+
+- name: Move web app
+  command: mv -n '/tmp/geoserver' '/var/lib/tomcat7/webapps/geoserver'
+  sudo: yes
+
+- name: reset geoserver owner
+  file:
+    state: directory
+    owner: tomcat7
+    group: "{{ deploy_user }}"
+    path: "/data"
+    mode: 0774
+    recurse: true
+  sudo: yes
+
 - name: Restart Tomcat
   service: name=tomcat7 state=restarted
   sudo: yes
-

ansible/roles/geoserver/templates/setenv.sh

@@ -1 +1 @@
-CATALINA_OPTS="$CATALINA_OPTS -Xms2048m -Xmx2048m  -XX:MaxPermSize=256m"
+CATALINA_OPTS="$CATALINA_OPTS -Xms4096m -Xmx4096m  -XX:MaxPermSize=512m"