deployment - fix media root configuration

fixes #20
MapStory · May 8, 2015 · c7bc5a0 · c7bc5a0
1 parent cb86b55
commit c7bc5a0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/scripts/provision/files/local_settings.py b/scripts/provision/files/local_settings.py
@@ -1,4 +1,5 @@
 from .local_key import *
+MEDIA_ROOT = '{{media_root}}'
 DATABASE_PASSWORD = '{{ pgpass }}'
 OGC_SERVER['default']['PASSWORD'] = '{{ gspass }}'
 OGC_SERVER['default']['PUBLIC_LOCATION'] = 'http://{{ nginx_server_name }}/geoserver/'

diff --git a/scripts/provision/files/nginx.conf b/scripts/provision/files/nginx.conf
@@ -14,7 +14,7 @@ alias {{ mapstory_geonode }}/mapstory/static_root/;
 
 # serve mediafiles, default 'uploaded' in GeoNode
 location /uploaded/ {
-root {{ media_root }};
+alias {{ media_root }};
 }
 
 # geoserver proxy

diff --git a/scripts/provision/mapstory.yml b/scripts/provision/mapstory.yml
@@ -39,6 +39,10 @@
   shell: source ~/.virtualenvs/mapstory/bin/activate && paver setup chdir={{ mapstory_geonode }}
   tags: [setup]
 
+- name: configure media root
+  file: path={{ media_root }} owner=www-data group=www-data mode=0775 state=directory
+  tags: [setup, media]
+
 - name: geogig global config
   copy: src=files/geogigconfig dest=~/.geogigconfig
   tags: [setup]

diff --git a/scripts/provision/vars.yml b/scripts/provision/vars.yml
@@ -4,7 +4,7 @@ mapstory_branch: mapstory-v2
 top_project: /srv/git/mapstory
 mapstory_geonode: '{{ top_project }}/mapstory-geonode'
 gspass: geoserverer
-media_root: /var/lib/mapstory/media
+media_root: /var/lib/mapstory/media/
 django_su_pass: admin
 nginx_server_name: 192.168.56.151
 fixtures: '../geonode/geonode/base/fixtures/initial_data.json mapstory/fixtures/initial_data.json'