Skip to content

Commit

Permalink
fix sed line, fix read input, fix change of source name from ledgersm…
Browse files Browse the repository at this point in the history
…b-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
  • Loading branch information
hasorli committed Dec 23, 2012
1 parent 539e3c9 commit bac6e26
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions configure_apache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down

0 comments on commit bac6e26

Please sign in to comment.