[osm-tile-server] 105/117: Many fixes
Ruben Undheim
rubund-guest at moszumanska.debian.org
Tue Nov 3 23:18:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository osm-tile-server.
commit 570ea9d6488ac6250edabe29cd9504a10c9be302
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Tue Nov 3 20:18:02 2015 +0100
Many fixes
---
debian/control | 11 +--
debian/copyright | 2 +-
debian/man/genmanpages.sh | 6 +-
debian/man/osm-tile-server-import.txt | 11 +++
debian/man/osm-tile-server-process.txt | 11 +++
debian/man/osm-tile-server-tilelite.txt | 11 +++
debian/man/osm-tile-server.conf.5 | 39 ----------
debian/man/osm-tile-server.txt | 11 +++
debian/osm-tile-server-base.config | 2 +-
debian/osm-tile-server-base.manpages | 2 +
debian/osm-tile-server-tilelite.manpages | 1 +
debian/osm-tile-server.manpages | 1 +
debian/rules | 10 +++
etc/tilelite.wsgi | 1 -
scripts/Makefile | 1 -
scripts/install-postgis-osm-db.sh | 83 ----------------------
scripts/osm-tile-server-import | 3 +-
src/Makefile | 4 +-
...erver-import.c => osm-tile-server-import-raw.c} | 0
src/parse-settings.c | 24 +++++--
20 files changed, 94 insertions(+), 140 deletions(-)
diff --git a/debian/control b/debian/control
index 2b1355a..4d65105 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,11 @@ Architecture: all
Depends: ${misc:Depends}, osm-tile-server-base,
osm-tile-server-tilelite
# Add other packages when ready: | osm-tile-server-mod-tile
-Description: Metapackage for installing OSM tile server
+Description: OpenStreetMap tile server
This is a metapackage for installing the OSM tile server.
+ It can use various 'backends', but the default is tilelite.
+ .
+ Postgis is always used as the backend database.
Package: osm-tile-server-base
Architecture: any
@@ -32,10 +35,10 @@ Depends: ${misc:Depends},
osm-tile-server-base, tilelite,
apache2, libapache2-mod-wsgi
#Breaks: osm-tile-server-mod-tile
-Description: This sets up a full OSM tile server using tilelite
+Description: Sets up a full OSM tile server using tilelite
To use tilelite as the tile server, install this
- package. It will set up a service which can be automatically
- started on boot.
+ package. It will set up apache2 to provide an OpenStreetMap
+ tile server.
#Package: osm-tile-server-mod-tile
#Architecture: all
diff --git a/debian/copyright b/debian/copyright
index a7788ad..9b58891 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Files: samples/liechtenstein-latest.osm.pbf
Copyright: OpenStreetMap contributors
License: ODbL
-Files: scripts/install-postgis-osm-db.sh scripts/install-postgis-osm-user.sh
+Files: scripts/install-postgis-osm-user.sh
Copyright: Kai Krueger
License: GPL-2+
diff --git a/debian/man/genmanpages.sh b/debian/man/genmanpages.sh
index 4e3cca1..75970c3 100755
--- a/debian/man/genmanpages.sh
+++ b/debian/man/genmanpages.sh
@@ -1,4 +1,8 @@
#!/bin/bash
-txt2man -t OSM-TILE-SERVER.CONF -s 5 osm-tile-server.conf.txt > osm-tile-server.conf.5
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER.CONF -s 5 osm-tile-server.conf.txt > osm-tile-server.conf.5
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-PROCESS -s 5 osm-tile-server-process.txt > osm-tile-server-process.1
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-IMPORT -s 5 osm-tile-server-import.txt > osm-tile-server-import.1
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-TILELITE -s 5 osm-tile-server-tilelite.txt > osm-tile-server-tilelite.7
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER -s 5 osm-tile-server.txt > osm-tile-server.7
diff --git a/debian/man/osm-tile-server-import.txt b/debian/man/osm-tile-server-import.txt
new file mode 100644
index 0000000..d1c9ff6
--- /dev/null
+++ b/debian/man/osm-tile-server-import.txt
@@ -0,0 +1,11 @@
+NAME
+ osm-tile-server-xx - xxxx
+
+DESCRIPTION
+ To...
+
+SEE ALSO
+ osm-tile-server(7)
+
+AUTHOR
+ This manual page was written by Ruben Undheim <ruben.undheim at gmail.com> for the Debian project (and may be used by others).
diff --git a/debian/man/osm-tile-server-process.txt b/debian/man/osm-tile-server-process.txt
new file mode 100644
index 0000000..d1c9ff6
--- /dev/null
+++ b/debian/man/osm-tile-server-process.txt
@@ -0,0 +1,11 @@
+NAME
+ osm-tile-server-xx - xxxx
+
+DESCRIPTION
+ To...
+
+SEE ALSO
+ osm-tile-server(7)
+
+AUTHOR
+ This manual page was written by Ruben Undheim <ruben.undheim at gmail.com> for the Debian project (and may be used by others).
diff --git a/debian/man/osm-tile-server-tilelite.txt b/debian/man/osm-tile-server-tilelite.txt
new file mode 100644
index 0000000..d1c9ff6
--- /dev/null
+++ b/debian/man/osm-tile-server-tilelite.txt
@@ -0,0 +1,11 @@
+NAME
+ osm-tile-server-xx - xxxx
+
+DESCRIPTION
+ To...
+
+SEE ALSO
+ osm-tile-server(7)
+
+AUTHOR
+ This manual page was written by Ruben Undheim <ruben.undheim at gmail.com> for the Debian project (and may be used by others).
diff --git a/debian/man/osm-tile-server.conf.5 b/debian/man/osm-tile-server.conf.5
deleted file mode 100644
index a20284d..0000000
--- a/debian/man/osm-tile-server.conf.5
+++ /dev/null
@@ -1,39 +0,0 @@
-.\" Text automatically generated by txt2man
-.TH OSM-TILE-SERVER.CONF 5 "06 September 2015" "" ""
-.SH NAME
-\fBosm-tile-server.conf \fP- Configuration for automatic setup of OSM tile server
-\fB
-.SH DESCRIPTION
-The osm-tile-server configuration file, /etc/osm-tile-server.conf, is used to configure how the automatic setup of an OSM tile server will be done. The default values are suitable for small imports on computers with limited memory resources. If you want to import an entire planet file, some changes should be done unless you want to wait forever.
-.TP
-.B
-DBNAME=
-Sets the postgres database name for the OpenStreetMap data
-.TP
-.B
-IMPORT_SLIM=
-true or false
-.RS
-.PP
-Sets import mode to \fB--slim\fP if true.
-.RE
-.TP
-.B
-IMPORT_MEMORY=
-Sets how many MBs of memory will be used during the import. (The "\fB-C\fP" argument for osm2pgsql)
-.TP
-.B
-IMPORT_CACHE_STRATEGY=
-optimized, dense, sparse, chunked
-.RS
-.PP
-Sets the cache strategy to use. (The "\fB--cache-strategy\fP %s" argument for osm2pgsql). See \fBosm2pgsql\fP(1) for details.
-.RE
-.TP
-.B
-SRC_URL=
-URL for downloading OSM data for regions. The default is "http://download.geofabrik.de"
-.SH SEE ALSO
-\fBosm2pgsql\fP(1)
-.SH AUTHOR
-This manual page was written by Ruben Undheim <ruben.undheim at gmail.com> for the Debian project (and may be used by others).
diff --git a/debian/man/osm-tile-server.txt b/debian/man/osm-tile-server.txt
new file mode 100644
index 0000000..d1c9ff6
--- /dev/null
+++ b/debian/man/osm-tile-server.txt
@@ -0,0 +1,11 @@
+NAME
+ osm-tile-server-xx - xxxx
+
+DESCRIPTION
+ To...
+
+SEE ALSO
+ osm-tile-server(7)
+
+AUTHOR
+ This manual page was written by Ruben Undheim <ruben.undheim at gmail.com> for the Debian project (and may be used by others).
diff --git a/debian/osm-tile-server-base.config b/debian/osm-tile-server-base.config
index 7e09abe..acc1f34 100644
--- a/debian/osm-tile-server-base.config
+++ b/debian/osm-tile-server-base.config
@@ -9,7 +9,7 @@ db_capb backup
CONFIGTYPEQUESTION=2
BACKSTATE=4
-source /etc/osm-tile-server.conf
+. /etc/osm-tile-server.conf
db_set osm-tile-server/db-name $DBNAME
db_input high osm-tile-server/db-name || true
diff --git a/debian/osm-tile-server-base.manpages b/debian/osm-tile-server-base.manpages
index ae5da95..9d7cb9b 100644
--- a/debian/osm-tile-server-base.manpages
+++ b/debian/osm-tile-server-base.manpages
@@ -1 +1,3 @@
debian/man/osm-tile-server.conf.5
+debian/man/osm-tile-server-process.1
+debian/man/osm-tile-server-import.1
diff --git a/debian/osm-tile-server-tilelite.manpages b/debian/osm-tile-server-tilelite.manpages
new file mode 100644
index 0000000..e6b1180
--- /dev/null
+++ b/debian/osm-tile-server-tilelite.manpages
@@ -0,0 +1 @@
+debian/man/osm-tile-server-tilelite.7
diff --git a/debian/osm-tile-server.manpages b/debian/osm-tile-server.manpages
new file mode 100644
index 0000000..7ada442
--- /dev/null
+++ b/debian/osm-tile-server.manpages
@@ -0,0 +1 @@
+debian/man/osm-tile-server.7
diff --git a/debian/rules b/debian/rules
index 1cd70d3..2fa904d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,17 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+CHANGELOG_DATE ?= $(shell date -d "`dpkg-parsechangelog --show-field Date`" +"%d %B %Y")
+
%:
dh $@
+override_dh_auto_clean:
+ $(RM) debian/man/*.1
+ $(RM) debian/man/*.5
+ $(RM) debian/man/*.7
+
+override_dh_installman:
+ cd debian/man ; CHANGELOG_DATE="$(CHANGELOG_DATE)" ./genmanpages.sh
+ dh_installman
diff --git a/etc/tilelite.wsgi b/etc/tilelite.wsgi
index dad497d..6dc83ed 100644
--- a/etc/tilelite.wsgi
+++ b/etc/tilelite.wsgi
@@ -1,5 +1,4 @@
from tilelite import Server
application = Server('/var/lib/osm-tile-server-base/tilesets/default/style.xml')
-dir(application)
diff --git a/scripts/Makefile b/scripts/Makefile
index 57b83f3..427c5b1 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -7,5 +7,4 @@ install:
mkdir -p ${DESTDIR}/usr/lib/osm-tile-server-base/bin
install osm-tile-server-status ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
install osm-tile-server-download ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
- install install-postgis-osm-db.sh ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
install install-postgis-osm-user.sh ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
diff --git a/scripts/install-postgis-osm-db.sh b/scripts/install-postgis-osm-db.sh
deleted file mode 100755
index a6e113c..0000000
--- a/scripts/install-postgis-osm-db.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ -z $DBOWNER ]; then
- DBOWNER=osm-tile-server
-fi
-if [ -z $DBNAME ]; then
- DBNAME=osmdb
-fi
-
-# echo "Removing Old Database"
-# sudo -u postgres dropdb $DBNAME >/dev/null 2>&1 || true
-
- echo "Create user $DBOWNER"
- sudo -u postgres createuser --no-superuser --no-createdb --no-createrole "$DBOWNER" || true
-
- echo "Creating Database"
- sudo -u postgres createdb -EUTF8 -O $DBOWNER $DBNAME
-
- echo "Initializing Database"
-
- sudo -u postgres createlang plpgsql $DBNAME || true
-
- if [ -e /usr/share/postgresql/9.3/extension/postgis.control ]; then
- echo "Initializing Spatial Extentions for postgresql 9.3"
- echo "CREATE EXTENSION postgis;" | sudo -u postgres psql $DBNAME
- echo "Initializing hstore"
- echo "CREATE EXTENSION hstore;" | sudo -u postgres psql $DBNAME
- else if [ -e /usr/share/postgresql/9.1/contrib/postgis-1.5/postgis.sql ] ; then
- echo "Initializing Spatial Extentions for postgresql 9.1"
- file_postgis=/usr/share/postgresql/9.1/contrib/postgis-1.5/postgis.sql
- file_spatial_ref=/usr/share/postgresql/9.1/contrib/postgis-1.5/spatial_ref_sys.sql
-
- sudo -u postgres psql $DBNAME <$file_postgis >/dev/null 2>&1
- sudo -u postgres psql $DBNAME <$file_spatial_ref >/dev/null 2>&1
- echo "Spatial Extentions initialized"
-
- echo "Initializing hstore"
- echo "CREATE EXTENSION hstore;" | sudo -u postgres psql $DBNAME
- else
- echo "Initializing Spatial Extentions for postgresql 8.4"
- file_postgis=/usr/share/postgresql/8.4/contrib/postgis-1.5/postgis.sql
- file_spatial_ref=/usr/share/postgresql/8.4/contrib/postgis-1.5/spatial_ref_sys.sql
-
- sudo -u postgres psql $DBNAME <$file_postgis >/dev/null 2>&1
- sudo -u postgres psql $DBNAME <$file_spatial_ref >/dev/null 2>&1
- echo "Spatial Extentions initialized"
-
- echo "Initializing hstore"
- file_hstore=/usr/share/postgresql/8.4/contrib/hstore.sql
- sudo -u postgres psql $DBNAME <$file_hstore >/dev/null 2>&1
- fi fi
-
- echo "Setting ownership to user $DBOWNER"
-
- echo 'ALTER TABLE geometry_columns OWNER TO ' $DBOWNER '; ALTER TABLE spatial_ref_sys OWNER TO ' $DBOWNER ';' | sudo -u postgres psql $DBNAME
-
-
-
-if [ -n "$GRANT_USER" ] ; then
-
- if [ "$GRANT_USER" = "*" ] ; then
- echo "GRANT Rights to every USER"
- GRANT_USER=''
- for user in `users` ; do
- GRANT_USER="$GRANT_USER $user"
- done
- fi
-
- for user in $GRANT_USER; do
- sudo -u postgres createuser --no-superuser --no-createdb --no-createrole "$user" || true
- echo "Granting rights to user '$user'"
- (
- echo "GRANT ALL on geometry_columns TO \"$user\";"
- echo "GRANT ALL ON SCHEMA PUBLIC TO \"$user\";"
- echo "GRANT ALL on spatial_ref_sys TO \"$user\";"
- )| sudo -u postgres psql -U postgres $DBNAME
- done
-else
- echo "No extra user for postgress Database created. Please do so yourself"
-fi
-
-exit 0
diff --git a/scripts/osm-tile-server-import b/scripts/osm-tile-server-import
index 39f1e77..301f4aa 100755
--- a/scripts/osm-tile-server-import
+++ b/scripts/osm-tile-server-import
@@ -2,7 +2,8 @@
no_permission(){
echo "You do not have permission to run this command."
- echo "Add yourself to the 'osm-tile-server' group"
+ echo "Run as 'root' or add yourself to the group:"
+ echo " 'osm-tile-server'"
}
umask 002
diff --git a/src/Makefile b/src/Makefile
index 5104671..307dbc6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,8 +6,8 @@ install: default
mkdir -p ${DESTDIR}/usr/lib/osm-tile-server-base/bin
install osm-tile-server-import-raw ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
-osm-tile-server-import-raw: osm-tile-server-import.o parse-settings.o
- ${CC} ${LDFLAGS} -o osm-tile-server-import-raw osm-tile-server-import.o parse-settings.o
+osm-tile-server-import-raw: osm-tile-server-import-raw.o parse-settings.o
+ ${CC} ${LDFLAGS} -o osm-tile-server-import-raw osm-tile-server-import-raw.o parse-settings.o
clean:
diff --git a/src/osm-tile-server-import.c b/src/osm-tile-server-import-raw.c
similarity index 100%
rename from src/osm-tile-server-import.c
rename to src/osm-tile-server-import-raw.c
diff --git a/src/parse-settings.c b/src/parse-settings.c
index de67fb1..0d98325 100644
--- a/src/parse-settings.c
+++ b/src/parse-settings.c
@@ -9,17 +9,29 @@ char cfg_memory[64];
int parse_one(const char *l, const char *cmp, char *var){
int len;
+ int i;
+ int linelen;
len = strlen(cmp);
- if(strncmp(cmp,l,strlen(cmp)) == 0) {
- if(l[7] == '\"'){
- char *substr = strstr(l+len+1,"\"");
+ linelen=strlen(l);
+ for(i=0;i<linelen;i++){
+ if(l[i] == '#' || l[i] == '\n'){
+ return -1;
+ }
+ else if (l[i] != ' ' && l[i] != '\t'){
+ break;
+ }
+ }
+ const char *reml = l+i;
+ if(strncmp(cmp,reml,strlen(cmp)) == 0) {
+ if(reml[strlen(cmp)] == '\"' || reml[strlen(cmp)] == '\''){
+ char *substr = strstr(reml+len+1,"\"");
*substr = 0;
- strncpy(var,l+len+1,63);
+ strncpy(var,reml+len+1,63);
}
else {
- char *substr = strstr(l+len+1,"\n");
+ char *substr = strstr(reml+len+1,"\n");
*substr = 0;
- strncpy(var,l+len,63);
+ strncpy(var,reml+len,63);
}
return 0;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git
More information about the Pkg-grass-devel
mailing list