X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4f4a288757d631028b6a0f8b072ca739736ab3de..c4a726c96b4458b19a45f17b810fafe808c35605:/vagrant/Install-on-Ubuntu-24.sh diff --git a/vagrant/Install-on-Ubuntu-24.sh b/vagrant/Install-on-Ubuntu-24.sh index 35882a79..b15eb3d8 100755 --- 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 - 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: @@ -116,6 +116,10 @@ fi #DOCS: 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 @@ -143,7 +147,7 @@ fi #DOCS: # 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:``` @@ -179,10 +183,8 @@ Type=simple 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 -StandardOutput=append:/var/log/gunicorn-nominatim.log -StandardError=inherit PrivateTmp=true TimeoutStopSec=5 KillMode=mixed