release 4.5.0.post7

[nominatim.git] / vagrant / Install-on-Ubuntu-24.sh

diff --git a/vagrant/Install-on-Ubuntu-24.sh b/vagrant/Install-on-Ubuntu-24.sh
index a8e9983705e75f11a5344c93a7e86a66c21956b7..b15eb3d884975d8c1026bb32eba5ffb84e319d31 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-24.sh
+++ b/vagrant/Install-on-Ubuntu-24.sh
@@ -98,7 +98,7 @@ fi                                    #DOCS:
 #
 if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh
     cd $USERHOME
 #
 if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh
     cd $USERHOME

-    git clone https://github.com/openstreetmap/Nominatim.git
+    git clone https://github.com/osm-search/Nominatim.git

     cd Nominatim
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
     cd Nominatim
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:


@@ -116,6 +116,10 @@ fi                                 #DOCS:
 
     virtualenv $USERHOME/nominatim-venv
 
 
     virtualenv $USERHOME/nominatim-venv
 

+# We want the faster binary version pf psycopg, so install that:
+
+    $USERHOME/nominatim-venv/bin/pip install psycopg[binary]
+

 # Now install Nominatim using pip:
 
     cd $USERHOME/Nominatim
 # Now install Nominatim using pip:
 
     cd $USERHOME/Nominatim


@@ -143,7 +147,7 @@ fi                                 #DOCS:
 # To install all packages, run:
 
 #DOCS:```sh
 # To install all packages, run:
 
 #DOCS:```sh

-$USERHOME/nominatim-venv/bin/pip install psycopg[binary] falcon uvicorn gunicorn
+$USERHOME/nominatim-venv/bin/pip install falcon uvicorn gunicorn

 cd $USERHOME/Nominatim
 $USERHOME/nominatim-venv/bin/pip install packaging/nominatim-api
 #DOCS:```
 cd $USERHOME/Nominatim
 $USERHOME/nominatim-venv/bin/pip install packaging/nominatim-api
 #DOCS:```


@@ -176,14 +180,11 @@ Requires=nominatim.socket
 
 [Service]
 Type=simple
 
 [Service]
 Type=simple

-Environment="PYTHONPATH=/usr/local/lib/nominatim/lib-python/"

 User=www-data
 Group=www-data
 WorkingDirectory=$USERHOME/nominatim-project
 User=www-data
 Group=www-data
 WorkingDirectory=$USERHOME/nominatim-project

-ExecStart=$USERHOME/nominatim-venv/bin/gunicorn -b unix:/run/nominatim.sock -w 4 -k uvicorn.workers.UvicornWorker nominatim_api.server.falcon.server:run_wsgi
+ExecStart=$USERHOME/nominatim-venv/bin/gunicorn -b unix:/run/nominatim.sock -w 4 -k uvicorn.workers.UvicornWorker "nominatim_api.server.falcon.server:run_wsgi()"

 ExecReload=/bin/kill -s HUP \$MAINPID
 ExecReload=/bin/kill -s HUP \$MAINPID

-StandardOutput=append:/var/log/gunicorn-nominatim.log
-StandardError=inherit

 PrivateTmp=true
 TimeoutStopSec=5
 KillMode=mixed
 PrivateTmp=true
 TimeoutStopSec=5
 KillMode=mixed