safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

CI: unify jobs for different vagrant scripts

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-08-23 17:41:13 +02:00
parent 4e77969545
commit 832f75a55e
3 changed files with 59 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vagrant/Install-on-Centos-8.sh
View File

@@ -57,7 +57,7 @@
# we assume this user is called nominatim and the installation will be in
# /srv/nominatim. To create the user and directory run:
#
# sudo useradd -d /srv/nominatim -s /bin/bash -m nominatim
# sudo useradd -d /srv/nominatim -s /bin/bash -m nominatim
#
# You may find a more suitable location if you wish.
#
@@ -85,8 +85,8 @@ fi #DOCS:
if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS:
sudo -u postgres /usr/pgsql-12/bin/pg_ctl initdb -D /var/lib/pgsql/12/data #DOCS:
sudo mkdir /var/log/postgresql
sudo chown postgres. /var/log/postgresql
sudo mkdir /var/log/postgresql #DOCS:
sudo chown postgres. /var/log/postgresql #DOCS:
else #DOCS:
sudo /usr/pgsql-12/bin/postgresql-12-setup initdb
fi #DOCS:

9
vagrant/Install-on-Ubuntu-18.sh
View File

@@ -80,9 +80,9 @@ fi #DOCS:
# Restart the postgresql service after updating this config file.
if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS:
sudo pg_ctlcluster 10 main start
sudo pg_ctlcluster 10 main start #DOCS:
else #DOCS:
sudo systemctl restart postgresql #DOCS:
sudo systemctl restart postgresql
fi #DOCS:
#
@@ -172,10 +172,13 @@ EOFAPACHECONF
#DOCS:```
#
# Then enable the configuration and restart apache
# Then enable the configuration with
#
sudo a2enconf nominatim
# and restart apache:
if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS:
sudo apache2ctl start #DOCS:
else #DOCS: