diff --git a/README.md b/README.md index cc42d7d..7580446 100644 --- a/README.md +++ b/README.md @@ -65,4 +65,6 @@ vi 00-install.sh | Sahana | 8001 | 8401 | | CKAN | 8003 | 8403 | | CKAN Datapusher | 8004 | N/A | +| Crisis Cleanup | 8005 | 8405 | +| CTS | 8006 | 8406 | | OpenMapKit | 8007 | 8407 | diff --git a/ckan/Dockerfile b/ckan/Dockerfile index ea8da5b..a9a315d 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -14,7 +14,7 @@ RUN \ apk --no-cache add libjpeg-turbo libmagic libpq py2-pip zlib \ # Install build dependencies && apk --no-cache add --virtual .deps git build-base libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev \ - # Add edge/testing repository for postgis support + # Add edge/testing repository for postgis (geos) support && echo 'http://repository.fit.cvut.cz/mirrors/alpine/edge/testing' >>/etc/apk/repositories \ && apk --no-cache add geos \ # Hackfix for python find_library('c') call diff --git a/crisiscleanup.sh b/crisiscleanup.sh index 0170ad6..cfc1379 100755 --- a/crisiscleanup.sh +++ b/crisiscleanup.sh @@ -12,7 +12,7 @@ envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i postgres psql # Copy existing config files into persistent storage mkdir -p /srv/crisiscleanup/conf chown 8005:8005 /srv/crisiscleanup/conf -docker run --rm -v /srv/crisiscleanup/conf:/mnt/config crisiscleanup cp -rp /srv/crisiscleanup/config/. /mnt/config +docker run --rm -v /srv/crisiscleanup/conf:/mnt/conf crisiscleanup cp -rp /srv/crisiscleanup/config/. /mnt/conf chown root:root /srv/crisiscleanup/conf # Configure CrisisCleanup @@ -30,7 +30,7 @@ docker run --rm --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/co docker run --rm --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config -v /tmp/seeds.rb:/srv/crisiscleanup/db/seeds.rb crisiscleanup rake db:seed rm /tmp/seeds.rb -# Create Rails service +# Create CrisisCleanup service cp ${SOURCE_DIR}/etc/init.d/crisiscleanup /etc/init.d/crisiscleanup rc-update add crisiscleanup boot service crisiscleanup start