[osm-tile-server] 86/117: Ask for the servername

[Ruben Undheim]

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 c9a9a290ae2129fe3705075fe0da9213050155b6
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Sep 8 18:24:53 2015 +0200

    Ask for the servername
---
 debian/osm-tile-server-tilelite.config    | 12 ++++++++++++
 debian/osm-tile-server-tilelite.postinst  |  4 ++++
 debian/osm-tile-server-tilelite.templates |  5 +++++
 etc/apache/osm-tile-server-tilelite.conf  |  4 ++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/osm-tile-server-tilelite.config b/debian/osm-tile-server-tilelite.config
new file mode 100644
index 0000000..c42b17e
--- /dev/null
+++ b/debian/osm-tile-server-tilelite.config
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_capb backup
+
+db_input high osm-tile-server/servername || true
+db_go
+
+exit 0
diff --git a/debian/osm-tile-server-tilelite.postinst b/debian/osm-tile-server-tilelite.postinst
index 9507018..0de3a59 100644
--- a/debian/osm-tile-server-tilelite.postinst
+++ b/debian/osm-tile-server-tilelite.postinst
@@ -22,10 +22,14 @@ set -e
 
 case "$1" in
     configure)
+        db_get osm-tile-server/servername
+        SERVERNAME=$RET
         DBUSER="osm-tile-server"
 
         chown $DBUSER:$DBUSER /var/cache/osm-tile-server-tilelite
 
+        sed -i 's/SERVERNAME/'$SERVERNAME'/' /etc/apache2/sites-available/osm-tile-server-tilelite.conf
+
         a2ensite osm-tile-server-tilelite.conf
         
     ;;
diff --git a/debian/osm-tile-server-tilelite.templates b/debian/osm-tile-server-tilelite.templates
new file mode 100644
index 0000000..74fb872
--- /dev/null
+++ b/debian/osm-tile-server-tilelite.templates
@@ -0,0 +1,5 @@
+
+Template: osm-tile-server/servername
+Type: string
+Default: localhost
+_Description: Enter name of servername to use for accessing this OSM tile server:
diff --git a/etc/apache/osm-tile-server-tilelite.conf b/etc/apache/osm-tile-server-tilelite.conf
index 459d6b6..1ec392e 100644
--- a/etc/apache/osm-tile-server-tilelite.conf
+++ b/etc/apache/osm-tile-server-tilelite.conf
@@ -1,8 +1,8 @@
 <VirtualHost *:80>
 
-ServerName localhost
+ServerName SERVERNAME
 
-WSGIScriptAlias /osm /usr/share/osm-tile-server-tilelite/wsgi/tilelite.wsgi
+WSGIScriptAlias / /usr/share/osm-tile-server-tilelite/wsgi/tilelite.wsgi
 WSGIDaemonProcess osm-tile-server-tilelite user=osm-tile-server group=osm-tile-server processes=10 threads=1
 WSGIProcessGroup osm-tile-server-tilelite
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git