From bac6e2668f5556e422dd8379e97fcf1dbb23a4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20S=C3=B8rli?= Date: Sun, 23 Dec 2012 03:57:01 +0000 Subject: [PATCH] fix sed line, fix read input, fix change of source name from ledgersmb-httpd.conf to ledgersmb-httpd.conf.template git-svn-id: svn://svn.code.sf.net/p/ledger-smb/code/branches/1.3@5398 4979c152-3d1c-0410-bac9-87ea11338e46 --- Changelog | 6 +++++- configure_apache.sh | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 4c9e6d2c6b..34162c8d7c 100644 --- a/Changelog +++ b/Changelog @@ -3,12 +3,16 @@ Initial Release: Monday, Oct 12 2011 Supported Presently Changelog for 1.3.27 - * Detect whether ledgersmb.conf exists during Makefile.PL run and create if not (Chris T) * Fixed prepare-company-database.sh clobbering the Apache configuration on every run (Chris T, 3595000) * Fixed error sorting recon search by account (Chris T, h/t Erik H, 3589473) +* Fixed configure_apache.sh, read input, change of file name from + ledgersmb-httpd.conf to ledgersmb-httpd.conf.template (Havard S) + +Chris T is Chris Travers +Havard S is Havard Sorli Changelog for 1.3.26 * Added db statistics post-upgrade and pre/post rebuild (Chris T, 3586113) diff --git a/configure_apache.sh b/configure_apache.sh index e5c7314be1..af2285d3c2 100644 --- a/configure_apache.sh +++ b/configure_apache.sh @@ -2,15 +2,15 @@ CWD=`pwd` -sed -i.orig "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf; +sed -e "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf.template > ledgersmb-httpd.conf username="apache" -read -p "Which user does your web server run as? [$username]" +read -p "Which user does your web server run as? [$username]" REPLY chown ${REPLY:-$username} spool templates css location="/etc/httpd/conf.d" -read -p "Where do we copy the ledgersmb-httpd.conf file to? [$location] " +read -p "Where do we copy the ledgersmb-httpd.conf file to? [$location] " REPLY cp ledgersmb-httpd.conf ${REPLY:-$location}