From a02f7ff226515e242ac56d42a3083fffdcc37d51 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 8 Dec 2002 14:38:28 +0000 Subject: Make sane defaults. Remove unused admindir and defaultadmindir. --- localezcreate | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/localezcreate b/localezcreate index 7db41b8..8d9f307 100755 --- a/localezcreate +++ b/localezcreate @@ -3,7 +3,7 @@ # /usr/local/sbin/localezcreate # Copyright 2001-2002 Jonas Smedegaard # -# $Id: localezcreate,v 1.17 2002-12-07 18:34:05 jonas Exp $ +# $Id: localezcreate,v 1.18 2002-12-08 14:38:28 jonas Exp $ # # Create local eZ Publish site # @@ -42,10 +42,9 @@ templates="" languages="en_GB en_GB_org" sqlchunks="publish data" defaulthome='`getent passwd $user | awk -F: '"'"'{print $6}'"'"';`' -defaultbasedir='$home/webphpsites/$host.$domain' +defaultbasedir='/var/www/ez-$host.$domain' defaultadminhost='admin.$host.$domain' -defaultadmindir='$home/webphpsites/$host.$domain/admin' -defaultwebcfg='/etc/apache/vhosts.d/$home.$domain' +defaultwebcfg='/etc/apache/vhosts.d/ez-$host.$domain' templatedirs="/usr/src/ezpublish/templates" languagedirs="/usr/src/ezpublish/lang" sqldirs="/usr/share/ezpublish/sql" @@ -53,7 +52,7 @@ 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 admindir webcfg" # Options requiring $opts1, $opts2 or $host 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 -- cgit v1.2.3