SF.net SVN: ledger-smb:[5394] trunk

[..hidden..]

Revision: 5394
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5394&view=rev
Author:   einhverfr
Date:     2012-12-22 06:28:17 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/tools/prepare-company-database.sh

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5391
   + /branches/1.3:3711-5393

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-12-22 06:23:27 UTC (rev 5393)
+++ trunk/Changelog	2012-12-22 06:28:17 UTC (rev 5394)
@@ -80,6 +80,13 @@
 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)
+
 Changelog for 1.3.26
 * Added db statistics post-upgrade and pre/post rebuild (Chris T, 3586113)
 * Merged in fcgi support from addons (Chris T)

Modified: trunk/tools/prepare-company-database.sh
===================================================================
--- trunk/tools/prepare-company-database.sh	2012-12-22 06:23:27 UTC (rev 5393)
+++ trunk/tools/prepare-company-database.sh	2012-12-22 06:28:17 UTC (rev 5394)
@@ -233,8 +233,8 @@
   set -x
 fi
 
-sed -e "s|WORKING_DIR|$dstdir|g" \
-   $srcdir/ledgersmb-httpd.conf.template >$dstdir/ledgersmb-httpd.conf
+# sed -e "s|WORKING_DIR|$dstdir|g" \
+#   $srcdir/ledgersmb-httpd.conf.template >$dstdir/ledgersmb-httpd.conf
 cat <<EOF | su -c "psql -U postgres -d postgres "  postgres 2>&1 | unchatter
 CREATE ROLE $owner WITH SUPERUSER LOGIN NOINHERIT ENCRYPTED PASSWORD '$pass';
 CREATE DATABASE $company_name WITH ENCODING = 'UNICODE' OWNER = $owner TEMPLATE = template0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.