From dfd588bc84d5b5e90965ca60123ec3ebec30851d Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 18 Jan 2018 15:35:32 +0100
Subject: [PATCH] Remove ckanext_pages extension as it causes Error 500

---
 ckan.sh                     | 4 ++--
 ckan/Dockerfile             | 4 +---
 ckan/srv/ckan/conf/ckan.ini | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ckan.sh b/ckan.sh
index 070e7fd..3678b47 100755
--- a/ckan.sh
+++ b/ckan.sh
@@ -18,12 +18,12 @@ chown 8983:8983 /srv/solr/data/ckan/conf/schema.xml
 service solr restart
 
 # Configure CKAN
+mkdir -p /srv/ckan/conf /srv/ckan/data
+chown -R 8003:8003 /srv/ckan/data
 export CKAN_SECRET=$(head -c 18 /dev/urandom | base64)
 export CKAN_UUID=$(cat /proc/sys/kernel/random/uuid)
-mkdir -p /srv/ckan/conf /srv/ckan/data
 envsubst <${SOURCE_DIR}/srv/ckan/conf/ckan.ini >/srv/ckan/conf/ckan.ini
 cp ${SOURCE_DIR}/srv/ckan/conf/who.ini /srv/ckan/conf/who.ini
-chown -R 8003:8003 /srv/ckan/data
 cp ${SOURCE_DIR}/srv/ckan/update-ip.sh /srv/ckan/update-ip.sh
 /srv/ckan/update-ip.sh
 
diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index 0b538e3..ef3496a 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -34,7 +34,6 @@ RUN \
  && pip install -e 'git+https://github.com/ckan/ckanext-spatial#egg=ckanext_spatial' \
  && pip install -e 'git+https://github.com/ckan/ckanext-geoview#egg=ckanext_geoview' \
  && pip install -e 'git+https://github.com/ckan/ckanext-mapviews#egg=ckanext_mapviews' \
- && pip install -e 'git+https://github.com/ckan/ckanext-pages#egg=ckanext_pages' \
  && pip install -e 'git+https://github.com/XVTSolutions/ckanext-spatialUI#egg=ckanext_spatialui' \
  && pip install -e 'git+https://github.com/aptivate/ckanext-datasetthumbnail#egg=ckanext_datasetthumbnail' \
  && pip install -e 'git+https://github.com/datagvat/ckanext-dgvat_xls#egg=ckanext_dgvat_xls' \
@@ -47,8 +46,7 @@ RUN \
  # Cleanup
  && apk del .deps \
  && find /srv/ckan/src -name '.git*' -exec rm -rf {} + \
- && rm -rf /root \
- && mkdir /root
+ && rm -rf /root/.cache
 
 VOLUME ["/etc/ckan", "/srv/ckan/storage"]
 EXPOSE 8003
diff --git a/ckan/srv/ckan/conf/ckan.ini b/ckan/srv/ckan/conf/ckan.ini
index 361a6d3..22272ec 100644
--- a/ckan/srv/ckan/conf/ckan.ini
+++ b/ckan/srv/ckan/conf/ckan.ini
@@ -100,7 +100,7 @@ ckan.redis.url = redis://redis:6379/0
 #       Add ``datapusher`` to enable DataPusher
 #		Add ``resource_proxy`` to enable resorce proxying and get around the
 #		same origin policy
-ckan.plugins = stats text_view image_view recline_view datastore datapusher resource_proxy linechart barchart piechart basicgrid spatial_metadata spatial_query geo_view geojson_view wmts_view navigablemap choroplethmap pages spatialUI datasetthumbnail dgvat_xls
+ckan.plugins = stats text_view image_view recline_view datastore datapusher resource_proxy linechart barchart piechart basicgrid spatial_metadata spatial_query geo_view geojson_view wmts_view navigablemap choroplethmap spatialUI datasetthumbnail dgvat_xls
 
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)