From: Marc Tobias Metten <mtmail@gmx.net>
Date: Fri, 16 Dec 2016 01:16:47 +0000 (+0100)
Subject: set directoryindex in Apache,nginx configuration
X-Git-Tag: v3.0.0~88^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/523873fe1675ef4c76b6d9633ca05d64eac9c45d?ds=inline;hp=-c

set directoryindex in Apache,nginx configuration
---

523873fe1675ef4c76b6d9633ca05d64eac9c45d
diff --git a/docs/Installation.md b/docs/Installation.md
index 678f0556..7f108160 100644
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -104,6 +104,7 @@ directory and create an alias:
     <Directory "/srv/nominatim/build/website">
       Options FollowSymLinks MultiViews
       AddType text/html   .php
+      DirectoryIndex search.php
       Require all granted
     </Directory>
     Alias /nominatim /srv/nominatim/build/website
@@ -134,13 +135,15 @@ follows:
 Tell nginx that php files are special and to fastcgi_pass to the php-fpm
 unix socket by adding the location definition to the default configuration.
 
+    root /srv/nominatim/build/website;
+    index search.php index.html;
     location ~ [^/]\.php(/|$) {
         fastcgi_split_path_info ^(.+?\.php)(/.*)$;
         if (!-f $document_root$fastcgi_script_name) {
             return 404;
         }
         fastcgi_pass unix:/var/run/php5-fpm.sock;
-        fastcgi_index index.php;
+        fastcgi_index search.php;
         include fastcgi.conf;
     }
 
diff --git a/vagrant/install-on-centos-7.sh b/vagrant/install-on-centos-7.sh
index cd1ddfb0..fd50bc52 100755
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -104,6 +104,7 @@ sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php
+  DirectoryIndex search.php
   Require all granted
 </Directory>
 
diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index aca3c66f..693be306 100755
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -41,6 +41,7 @@ sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF > /dev/null
     <Directory "$TRAVIS_BUILD_DIR/build/website">
       Options FollowSymLinks MultiViews
       AddType text/html   .php
+      DirectoryIndex search.php
       Require all granted
     </Directory>
 
diff --git a/vagrant/install-on-ubuntu-16.sh b/vagrant/install-on-ubuntu-16.sh
index b40dbce1..137085a1 100755
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -104,6 +104,7 @@ sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php
+  DirectoryIndex search.php
   Require all granted
 </Directory>