From 1c815fe095a97d1a91cb9e411e64ecc1bd6bc023 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 8 Dec 2002 15:06:22 +0000
Subject: Even more sane defaults - and opts1-3 moved above defaults and better
 described.

---
 localezcreate | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'localezcreate')

diff --git a/localezcreate b/localezcreate
index 8d9f307..3df495e 100755
--- a/localezcreate
+++ b/localezcreate
@@ -3,7 +3,7 @@
 # /usr/local/sbin/localezcreate
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localezcreate,v 1.18 2002-12-08 14:38:28 jonas Exp $
+# $Id: localezcreate,v 1.19 2002-12-08 15:06:22 jonas Exp $
 #
 # Create local eZ Publish site
 #
@@ -25,6 +25,12 @@ if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 
 eval set -- "$TEMP"
 
+# Defaults are evaluated at runtime in this order
+# (If changing defaults, you might need to change these as well)
+opts1="user group domain maildomain dbserver dballow" # Options with self-contained defaults
+opts2="dbuser home" # Options requiring $opts1 to resolve default
+opts3="mailuser dbname basedir adminhost webcfg" # Options requiring $opts1, $opts2 or $host to resolve default
+
 # Defaults
 defaultuser="www-data"
 defaultgroup="www-data"
@@ -41,7 +47,7 @@ defaultforce="off"
 templates=""
 languages="en_GB en_GB_org"
 sqlchunks="publish data"
-defaulthome='`getent passwd $user | awk -F: '"'"'{print $6}'"'"';`'
+defaulthome="/var/www"
 defaultbasedir='/var/www/ez-$host.$domain'
 defaultadminhost='admin.$host.$domain'
 defaultwebcfg='/etc/apache/vhosts.d/ez-$host.$domain'
@@ -49,11 +55,6 @@ templatedirs="/usr/src/ezpublish/templates"
 languagedirs="/usr/src/ezpublish/lang"
 sqldirs="/usr/share/ezpublish/sql"
 
-# If overriding some defaults, you might need to change these as well
-opts1="user group domain maildomain dbserver dballow" # Options with self-contained defaults
-opts2="dbuser home" # Options requiring $opts1 to resolve default
-opts3="mailuser dbname basedir adminhost webcfg" # Options requiring $opts1, $opts2 or $host to resolve default
-
 # Override defaults from config file if available
 if [ -e /etc/local/localezcreate.conf ]; then
 	. /etc/local/localezcreate.conf
-- 
cgit v1.2.3