travis-ci: we dont need Apache installed

diff --git a/.travis.yml b/.travis.yml
index 8370fb59cad7fe339efcf2428ea22d94b70c52ab..b16d8106f760f74fbea9a332b5eb531b205af83e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
 before_install:
   - phpenv global 7.4
 install:
 before_install:
   - phpenv global 7.4
 install:

-  - vagrant/install-on-travis-ci.sh
+  - vagrant/Install-on-Travis-CI.sh

 before_script:
   - psql -U postgres -c "create extension postgis"
 script:
 before_script:
   - psql -U postgres -c "create extension postgis"
 script:

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/Install-on-Travis-CI.sh
similarity index 78%
rename from vagrant/install-on-travis-ci.sh
rename to vagrant/Install-on-Travis-CI.sh
index 66d3c7947324ce00c3ec1d961bdb705c6655e00b..9c1fe367d3bba09c4e2f64b1ac1c35f1a6694eea 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/Install-on-Travis-CI.sh
@@ -18,7 +18,7 @@ sudo apt-get install -y -qq build-essential cmake g++ libboost-dev libboost-syst
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-12 postgresql-12-postgis-3 \
                             postgresql-contrib postgresql-12-postgis-3-scripts \
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-12 postgresql-12-postgis-3 \
                             postgresql-contrib postgresql-12-postgis-3-scripts \

-                            apache2 php php-pgsql libapache2-mod-php \
+                            php php-pgsql \

                             php-intl python3-setuptools python3-dev python3-pip \
                             python3-psycopg2 python3-tidylib git
 
                             php-intl python3-setuptools python3-dev python3-pip \
                             python3-psycopg2 python3-tidylib git
 


@@ -39,22 +39,6 @@ sudo -u postgres createuser -S www-data
 chmod a+x $HOME
 chmod a+x $TRAVIS_BUILD_DIR
 
 chmod a+x $HOME
 chmod a+x $TRAVIS_BUILD_DIR
 

-
-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>
-
-    Alias /nominatim $TRAVIS_BUILD_DIR/build/website
-EOFAPACHECONF
-
-
-sudo a2enconf nominatim
-sudo service apache2 restart
-

 wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
 
 mkdir build
 wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
 
 mkdir build


@@ -65,7 +49,6 @@ make
 
 tee settings/local.php << EOF
 <?php
 
 tee settings/local.php << EOF
 <?php

- @define('CONST_Website_BaseURL', '/nominatim/');

  @define('CONST_Database_DSN', 'pgsql:dbname=test_api_nominatim');
  @define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/test/testdb');
  @define('CONST_Replication_Max_Diff_size', '3');
  @define('CONST_Database_DSN', 'pgsql:dbname=test_api_nominatim');
  @define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/test/testdb');
  @define('CONST_Replication_Max_Diff_size', '3');