[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_2-24-gf5a17d8

[Stefan Hornburg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  f5a17d86642e6b02fb0043b70353056eb109b029 (commit)
      from  462c8b41fa00247f707536db4ef015493fda8a05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f5a17d86642e6b02fb0043b70353056eb109b029
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Thu Oct 29 10:17:57 2009 +0100

    keep virtual host name supplied by the user

-----------------------------------------------------------------------

Summary of changes and diff:
 debian/interchange-cat-standard.config |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/interchange-cat-standard.config b/debian/interchange-cat-standard.config
index 621ebe6..aef235c 100644
--- a/debian/interchange-cat-standard.config
+++ b/debian/interchange-cat-standard.config
@@ -1,6 +1,6 @@
 #! /bin/sh -e
 #
-# Copyright 2001,2002,2003,2004,2005,2006,2008 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2002,2003,2004,2005,2006,2008,2009 by Stefan Hornburg (Racke) <racke at linuxia.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -63,7 +63,10 @@ db_go
 # web parameters
 db_get interchange/full_url
 if [ "$RET" = "true" ]; then
-	db_set interchange-cat-standard/vhost `hostname --fqdn`
+	db_get interchange-cat-standard/vhost
+	if [ ! "$RET" ]; then
+		db_set interchange-cat-standard/vhost `hostname --fqdn`
+	fi
 	db_input medium interchange-cat-standard/vhost || [ $? -eq 30 ]
 	db_go
 fi


hooks/post-receive
-- 
Interchange