Index: openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info,v
diff -u -r1.39.2.14 -r1.39.2.15
--- openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info	6 Sep 2016 17:33:55 -0000	1.39.2.14
+++ openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info	15 Sep 2016 07:21:10 -0000	1.39.2.15
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-   <version name="5.9.1d4" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.9.1d4.apm">
+   <version name="5.9.1d5" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.9.1d5.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Bootstraps an OpenACS installation.</summary>
         <release-date>2015-10-04</release-date>
@@ -18,7 +18,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-bootstrap-installer" version="5.9.1d4"/>
+        <provides url="acs-bootstrap-installer" version="5.9.1d5"/>
         <requires url="acs-kernel" version="5.9.0"/>
         <requires url="acs-templating" version="5.9.0"/>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-bootstrap-installer/installer/www/SYSTEM/csp-collector.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -r1.43.2.2 -r1.43.2.3
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	30 Nov 2015 12:57:42 -0000	1.43.2.2
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	15 Sep 2016 07:21:10 -0000	1.43.2.3
@@ -607,12 +607,15 @@
 } {
     set source $::acs::rootdir/packages/acs-bootstrap-installer/installer/tcl
     foreach file [glob -nocomplain $source/*tcl] {
-        file copy -force $file $::acs::rootdir/tcl
+        file copy -force $file $::acs::rootdir/tcl/
     }
     set source $::acs::rootdir/packages/acs-bootstrap-installer/installer/www
     foreach file [glob -nocomplain $source/*tcl $source/*adp] {
-        file copy -force $file $::acs::rootdir/www
+        file copy -force $file $::acs::rootdir/www/
     }
+    foreach file [glob -nocomplain $source/SYSTEM/*tcl] {
+        file copy -force $file $::acs::rootdir/www/SYSTEM/
+    }
 }
 
 #
Index: openacs-4/www/SYSTEM/csp-collector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/SYSTEM/csp-collector.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/SYSTEM/csp-collector.tcl	11 Sep 2016 00:49:28 -0000	1.1.2.1
+++ openacs-4/www/SYSTEM/csp-collector.tcl	15 Sep 2016 07:21:10 -0000	1.1.2.2
@@ -1,2 +1,2 @@
-ns_log notice "CSP violation: [ns_conn content] user-agent: [ns_set iget [ns_conn headers] user-agent] user_id [ad_conn user_id]"
+ns_log notice "CSP violation: [ns_conn content] user-agent: [ns_set iget [ns_conn headers] user-agent] user_id [ad_conn user_id] peer [ad_conn peeraddr]"
 ns_return 200 text/plain ok