diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-28 12:37:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-28 12:37:32 +0200 |
| commit | 0168ef4982a1a47053d434e0feffd1d7bc2c1de7 (patch) | |
| tree | bb9c69b4d6f8a18cf50d8a5fa14d705420504a4b | |
| parent | 7e14be9b90fac389338210307c6f466e219b4b41 (diff) | |
| download | Ishtar-0168ef4982a1a47053d434e0feffd1d7bc2c1de7.tar.bz2 Ishtar-0168ef4982a1a47053d434e0feffd1d7bc2c1de7.zip | |
Install: adding dnsmasq entries
| -rwxr-xr-x | install/ishtar-install | 2 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 4 |
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" |