diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rw-r--r-- | nominatim.install | 4 | ||||
| -rw-r--r-- | php.ini | 2 | ||||
| -rw-r--r-- | settings-local.php | 5 | ||||
| -rw-r--r-- | webapps-paths.patch | 2 |
6 files changed, 30 insertions, 21 deletions
@@ -1,7 +1,7 @@ pkgbase = nominatim pkgdesc = Geocoding tool using OpenStreetmap data pkgver = 3.4.1 - pkgrel = 4 + pkgrel = 5 url = https://nominatim.org install = nominatim.install arch = x86_64 @@ -27,15 +27,17 @@ pkgbase = nominatim source = nominatim.sysusers source = nominatim.tmpfiles source = apache.conf + source = php.ini source = settings-local.php source = webapps-paths.patch sha256sums = eea1e0e4bd0fd5c9408a734e3ad687879fbcdf670edbfa7c678daf7dc1d0fae2 - sha256sums = 79499b5d2a4c364f3e658e837e315644023cf120eca6b7c368aa059ab6b5082d + sha256sums = 0be6ea5234b8622854e6147aa22afd7adfe15546ee1b514acde1654f44e75148 sha256sums = 7db2c5ff31954c02421fadd06b6758e181a7028f5ac73b16f3abdcb4caef6879 sha256sums = 1999cb2bb75046a4ea1b326082a4c1cf5de54f12ed36b1d22540c842c7c30b9d sha256sums = 8dd94ea1a88156bc55dc41e4f4df878df4f28c23c31bfda36c89470e2f5997d0 - sha256sums = df040410ab16df4e45c14b3c3857b58d995e8a4a73dbc111612426617e68f53a - sha256sums = c056160b4d7ec1ed43905a6d13f265f4c726ed660b819091ba17786aca525477 + sha256sums = 1bf1328abbc9b7453800d3e408ae14ea22d0d4ba9dc6d49b21a0e3121a6fbd49 + sha256sums = a1f3c804b2066501554c2e3af0dff3b9b16a3f89117b7e4c5e45e9c858747f74 + sha256sums = 26c0cf16dd4fe2ce597a9495f5161d78a9f1f5276d8c3cf60b26b40b56caf8f1 pkgname = nominatim @@ -5,7 +5,7 @@ pkgdesc="Geocoding tool using OpenStreetmap data" url="https://nominatim.org" pkgver=3.4.1 -pkgrel=4 +pkgrel=5 arch=("x86_64") license=("GPL2") @@ -49,17 +49,19 @@ source=( "${pkgname}.sysusers" "${pkgname}.tmpfiles" "apache.conf" + "php.ini" "settings-local.php" "webapps-paths.patch" ) sha256sums=( "eea1e0e4bd0fd5c9408a734e3ad687879fbcdf670edbfa7c678daf7dc1d0fae2" - "79499b5d2a4c364f3e658e837e315644023cf120eca6b7c368aa059ab6b5082d" + "0be6ea5234b8622854e6147aa22afd7adfe15546ee1b514acde1654f44e75148" "7db2c5ff31954c02421fadd06b6758e181a7028f5ac73b16f3abdcb4caef6879" "1999cb2bb75046a4ea1b326082a4c1cf5de54f12ed36b1d22540c842c7c30b9d" "8dd94ea1a88156bc55dc41e4f4df878df4f28c23c31bfda36c89470e2f5997d0" - "df040410ab16df4e45c14b3c3857b58d995e8a4a73dbc111612426617e68f53a" - "c056160b4d7ec1ed43905a6d13f265f4c726ed660b819091ba17786aca525477" + "1bf1328abbc9b7453800d3e408ae14ea22d0d4ba9dc6d49b21a0e3121a6fbd49" + "a1f3c804b2066501554c2e3af0dff3b9b16a3f89117b7e4c5e45e9c858747f74" + "26c0cf16dd4fe2ce597a9495f5161d78a9f1f5276d8c3cf60b26b40b56caf8f1" ) install="${pkgname}.install" @@ -96,34 +98,34 @@ package() { "data-sources" \ "lib" \ "munin" \ + "settings" \ "sql" \ "utils" \ "wikidata" do install \ -Ddm755 \ - "${srcdir}/Nominatim-${pkgver}/${_dir}" \ - "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}" + "${pkgdir}/usr/share/webapps/${pkgname}/src/${_dir}" cp \ - -aR \ + -avR \ "${srcdir}/Nominatim-${pkgver}/${_dir}" \ - "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}" + "${pkgdir}/usr/share/webapps/${pkgname}/src/" done # directories to copy from build dir - for dir in \ + for _dir in \ "settings" \ + "utils" \ "website" do install \ -Ddm755 \ - "${srcdir}/build/${_dir}" \ "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}" cp \ - -aR \ + -avR \ "${srcdir}/build/${_dir}" \ - "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}" + "${pkgdir}/usr/share/webapps/${pkgname}/" done install -Dm755 "${srcdir}/build/module/nominatim.so" -t "${pkgdir}/usr/share/webapps/${pkgname}/module/" @@ -134,6 +136,8 @@ package() { install -Dm644 "${srcdir}/apache.conf" -t "${pkgdir}/etc/webapps/${pkgname}" install -Dm644 "${srcdir}/settings-local.php" "${pkgdir}/usr/share/webapps/${pkgname}/settings/local.php" + install -Dm644 "${srcdir}/php.ini" "${pkgdir}/etc/php/conf.d/nominatim.ini" + install -Dm 644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" install -Dm 644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" } diff --git a/nominatim.install b/nominatim.install index cb3d19a32b0e..dfc68d6834fd 100644 --- a/nominatim.install +++ b/nominatim.install @@ -2,8 +2,8 @@ post_install() { cat <<- 'EOF' - Create a PostgreSQL database and users for nomination by running - `sudo su - postgres "createuser nominatim; createdb -O nominatim nominatim; createuser http"` + Create the required PostgreSQL and users for nominatim by running + `sudo su - postgres "createuser -s nominatim; createuser http"` Then `su` to user `nominatim` and follow the instructions at http://nominatim.org/release-docs/latest/admin/Import-and-Update/#choosing-the-data-to-import to download and import data. diff --git a/php.ini b/php.ini new file mode 100644 index 000000000000..5646b6d55eb7 --- /dev/null +++ b/php.ini @@ -0,0 +1,2 @@ +extension=pdo_pgsql +extension=pgsql diff --git a/settings-local.php b/settings-local.php index a5ff80746897..70dd6f0bbe57 100644 --- a/settings-local.php +++ b/settings-local.php @@ -1,3 +1,4 @@ <?php - @define('CONST_Website_BaseURL', '/nominatim/'); - @define('CONST_Osm2pgsql_Flatnode_File', '/var/lib/nominatim/flatnode.file'); + @define('CONST_Website_BaseURL', '/nominatim/'); + @define('CONST_Osm2pgsql_Flatnode_File', '/var/lib/nominatim/flatnode.file'); + @define('CONST_Osm2pgsql_Binary', '/usr/bin/osm2pgsql'); diff --git a/webapps-paths.patch b/webapps-paths.patch index 14ae2c3ca9b7..7ced7cdedd4c 100644 --- a/webapps-paths.patch +++ b/webapps-paths.patch @@ -5,7 +5,7 @@ diff -ru a/settings/defaults.php b/settings/defaults.php <?php -@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@'); -@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@'); -+@define('CONST_BasePath', '/usr/share/webapps/nominatim'); ++@define('CONST_BasePath', '/usr/share/webapps/nominatim/src'); +@define('CONST_InstallPath', '/usr/share/webapps/nominatim'); if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS')); if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php'); |