summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinstall/ishtar-install2
-rwxr-xr-xinstall/ishtar-prepare-instance4
2 files changed, 5 insertions, 1 deletions
diff --git a/install/ishtar-install b/install/ishtar-install
index d43fc708a..d189309fc 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -413,7 +413,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-requests \
- python-bs4 python-cffi python-django-compressor pandoc \
+ python-bs4 python-cffi python-django-compressor pandoc dnsmasq \
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 d5470e502..bbdbd382b 100755
--- a/install/ishtar-prepare-instance
+++ b/install/ishtar-prepare-instance
@@ -181,6 +181,10 @@ EOF
DB_PASSWORD=$(apg -a 0 -M ncl -n 1 -x 10 -m 10)
fi
+ # dnsmasq
+ echo "* adding domain to local dnsmasq entry"
+ echo "address=/"$URL"/127.0.0.1" >> /etc/dnsmasq.d/ishtar
+
export PG_VERSION DB_HOST DB_PORT DB_PASSWORD DB_NAME POSTGIS_VERSION
su postgres <<'EOF'
echo " * Checking template_postgis"