[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

Revision: 5402
Author:   einhverfr
Date:     2012-12-24 13:57:27 +0000 (Mon, 24 Dec 2012)
Log Message:
Merging from branches/1.2

Modified Paths:

Property Changed:

Property changes on: trunk
Modified: svn:mergeinfo
   - /branches/1.3:3711-5396
   + /branches/1.3:3711-5401

Modified: trunk/Changelog
--- trunk/Changelog	2012-12-24 13:49:02 UTC (rev 5401)
+++ trunk/Changelog	2012-12-24 13:57:27 UTC (rev 5402)
@@ -83,13 +83,20 @@
 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)
+* Users are now migrated with nonsense passwords from 1,2 (Chris T, 3587257)
+* Upgrade now handles new total column in jcitems properly (Chris T)
+* Fixed configure_apache.sh, read input, change of file name from 
+  ledgersmb-httpd.conf to ledgersmb-httpd.conf.template (Havard S)
+* Update INSTALL - section "Adding configuration to Apache 2.x" (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)
 * Merged in fcgi support from addons (Chris T)

Modified: trunk/INSTALL
--- trunk/INSTALL	2012-12-24 13:49:02 UTC (rev 5401)
+++ trunk/INSTALL	2012-12-24 13:57:27 UTC (rev 5402)
@@ -309,6 +309,9 @@
 support) and IIS are known to support this requirement. The section below
 details the Apache setup process.
+Default installation layouts for Apache HTTPD on various operating systems 
+and distributions: http://wiki.apache.org/httpd/DistrosDefaultLayout
 If your Apache has been built with module support, your configuration files
 should include the following line somewhere:
@@ -321,15 +324,18 @@
 executed as the root user.]
 A default configuration file to be used with Apache2 comes with LedgerSMB in
-its root project directory: ledgersmb-httpd.conf.template.  If you ran the
-'prepare-company-database.sh' script from the last section, the template
-has been filled out for you and stored as ledgersmb-httpd.conf.
+its root project directory: ledgersmb-httpd.conf.template. You can use the 
+'configure_apache.sh' script to fill out the template.
-You need to add a commmand to your Apache configuration to load the
+You my need to add a commmand to your Apache configuration to load the
 configuration in that file by including the following line:
 Include /path/to/ledgersmb/ledgersmb-httpd.conf
+If your distribution load extra config files from example conf.d 
+you do not need to add the the line to your Apache configuration.
+[Debian, Fedora, Centos, RedHat]
 [On Debian and derivatives, you can store the resulting
 configuration file directly in the /etc/apache2/conf.d directory.  From
 that location, it'll be automatically included upon the next server (re)start.]

Modified: trunk/sql/upgrade/1.2-1.4.sql
--- trunk/sql/upgrade/1.2-1.4.sql	2012-12-24 13:49:02 UTC (rev 5401)
+++ trunk/sql/upgrade/1.2-1.4.sql	2012-12-24 13:57:27 UTC (rev 5402)
@@ -366,19 +366,31 @@
 INSERT INTO person (first_name, last_name, entity_id) 
 select name, name, entity_id FROM lsmb12.employee;
-INSERT INTO users (entity_id, username)
-     SELECT entity_id, login FROM lsmb12.employee em
-      WHERE login IS NOT NULL;
   INTO entity_employee(entity_id, startdate, enddate, role, ssn, sales,
        employeenumber, dob, manager_id)
 SELECT entity_id, startdate, enddate, role, ssn, sales, employeenumber, dob,
        (select entity_id from lsmb12.employee where id = em.managerid)
-  FROM lsmb12.employee em;
+  FROM lsmb12.employee em
+ WHERE id IN (select min(id) from lsmb12.employee group by entity_id);
+-- I would prefer stronger passwords here but the exposure is very short, since 
+-- the passwords time out after 24 hours anyway.  These are not assumed to be
+-- usable passwords. --CT
+SELECT admin__save_user(null, max(entity_id), login, random()::text, true)
+  FROM lsmb12.employee
+ WHERE login IN (select rolname FROM pg_roles)
+ GROUP BY login;
+SELECT 	admin__save_user(null, max(entity_id), login, random()::text, false)
+  FROM lsmb12.employee
+ WHERE login NOT IN (select rolname FROM pg_roles)
+ GROUP BY login;
 -- must rebuild this table due to changes since 1.2
 -- needed to handle null values
@@ -664,9 +676,6 @@
        JOIN lsmb12.employee e ON a.employee_id = e.id
        JOIN person p on e.entity_id = p.entity_id;
-INSERT INTO user_preference(id)
-     SELECT id from users;
 INSERT INTO recurring SELECT * FROM lsmb12.recurring;
 INSERT INTO recurringemail SELECT * FROM lsmb12.recurringemail;
@@ -678,7 +687,7 @@
             person_id, notes, total)
      SELECT j.id,  project_id + 1000, parts_id, description, qty, allocated,
             sellprice, fxsellprice, serialnumber, checkedin, checkedout,
-            p.id, j.notes, qty
+            p.id, j.notes, coalesce(qty, 0)
        FROM lsmb12.jcitems j
        JOIN lsmb12.employee e ON j.employee_id = e.id
        JOIN person p ON e.entity_id = p.entity_id;

Property changes on: trunk/sql/upgrade/1.2-1.4.sql
Modified: svn:mergeinfo
   - /branches/1.3/sql/upgrade/1.2-1.3.sql:3711-5182
   + /branches/1.3/sql/upgrade/1.2-1.3.sql:3711-5401

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