summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-02-01 17:01:48 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-02-01 17:03:59 +0100
commitd3a686cf4032d2c4bf975498d46136c53029f5a7 (patch)
tree1898140625ebaef056a279d518a56fa2672bf505
parent407fd0de82f227d9d01a9bb637c928e5207b0d29 (diff)
downloadIshtar-d3a686cf4032d2c4bf975498d46136c53029f5a7.tar.bz2
Ishtar-d3a686cf4032d2c4bf975498d46136c53029f5a7.zip
Adapt install and prepare instance for django-compressor
-rwxr-xr-xinstall/ishtar-install5
-rwxr-xr-xinstall/ishtar-prepare-instance2
2 files changed, 6 insertions, 1 deletions
diff --git a/install/ishtar-install b/install/ishtar-install
index 8a51044ea..fcca1291f 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -370,6 +370,9 @@ EOF
cecho y "Installing django-formtools"
echo "";
( set -x; $sh_c 'pip install django-formtools==2.1' )
+ cecho y "Installing django-compressor"
+ echo "";
+ ( set -x; $sh_c 'pip install django-compressor==2.1' )
fi
@@ -398,7 +401,7 @@ EOF
( set -x; $sh_c 'sleep 3; apt-get install -t stretch-backports -y -q python-django' )
( set -x; $sh_c 'sleep 3; apt-get install -y -q \
python-django-registration libpangocairo-1.0-0 \
- python-bs4 python-cffi \
+ python-bs4 python-cffi python-django-compressor \
python-tidylib python-lxml python-imaging python-html5lib \
python-psycopg2 python-gdal gettext python-unicodecsv memcached \
python-django-extra-views python-memcache python-dbf python-markdown \
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance
index b05d7d16d..fced9602e 100755
--- a/install/ishtar-prepare-instance
+++ b/install/ishtar-prepare-instance
@@ -166,7 +166,9 @@ EOF
mkdir -p -m 755 "$INSTANCE/media"
mkdir -p -m 755 "$INSTANCE/media/imported"
mkdir -p -m 755 "$INSTANCE/media/upload"
+ mkdir -p -m 755 "$INSTANCE/static/CACHE"
chown -R www-data:www-data "$INSTANCE/media"
+ chown -R www-data:www-data "$INSTANCE/static/CACHE"
# Preparing DB:
DB_HOST=${ISHTAR_DB-127.0.0.1}