From: Roland Mas <lolando@debian.org>
Date: Thu, 22 Apr 2010 18:55:08 +0000 (+0000)
Subject: Contentless (almost) merge from 5.0
X-Git-Tag: v5.1~2492
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=faa57cb5a4c4e5179a9e6e92dfa16cab4f54ac7b

Contentless (almost) merge from 5.0
---

faa57cb5a4c4e5179a9e6e92dfa16cab4f54ac7b
diff --cc gforge/setup
index 4ce1c87,c55dced..c4bb382
--- a/gforge/setup
+++ b/gforge/setup
@@@ -13,11 -13,11 +13,11 @@@ getval()
  computedefault(){
  	echo "Calculating defaults"
  	# This is used to make a default working gforge.conf
- 	DEFAULTsystem_name=MyGForge
+ 	DEFAULTsystem_name=MyForge
  	DEFAULTdomain_name=`hostname -f`
  	DEFAULTserver_admin=webmaster@$DEFAULTdomain_name
 -	DEFAULTdb_host=`hostname -i`
 -	DEFAULTdb_port=5432
 +	DEFAULTdb_host=
 +	DEFAULTdb_port=
  	DEFAULTdb_name=gforge
  	DEFAULTdb_user=gforge
  	DEFAULTdb_password=$(dd if=/dev/urandom count=256 bs=1 2> /dev/null | md5sum | cut -b1-8)