Added sugar-stats and sugar client, plus custom config file in 90-tweaks

Added custom local Browse-146.1 via [sugar_activities_extra]

6 files changed, 54 insertions, 2 deletions

diff --git a/activities/browse-146.1.xo b/activities/browse-146.1.xo
new file mode 100644
index 0000000..23a7584
--- /dev/null
+++ b/activities/browse-146.1.xo
diff --git a/activities/log b/activities/log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/activities/log
diff --git a/examples/dextrose4-xo1.5.ini b/examples/dextrose4-xo1.5.ini
index f377322..4bc846d 100644
--- a/examples/dextrose4-xo1.5.ini
+++ b/examples/dextrose4-xo1.5.ini
@@ -80,6 +80,9 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1/13.1
 
+[sugar_activities_extra]
+local_dir = activities
+
 [buildnr_from_file]
 path=latestbuild-xo1.5
 
diff --git a/examples/dextrose4-xo4.ini b/examples/dextrose4-xo4.ini
index 940035f..d8bf5f7 100644
--- a/examples/dextrose4-xo4.ini
+++ b/examples/dextrose4-xo4.ini
@@ -138,4 +138,6 @@ add_packages=
         ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
-          
+; Stats
+        sugar-stats
+        sugar-client
diff --git a/modules/base/.preimage.90.core.sh.swp b/modules/base/.preimage.90.core.sh.swp
new file mode 100644
index 0000000..6d98cd5
--- /dev/null
+++ b/modules/base/.preimage.90.core.sh.swp
diff --git a/modules/x11/kspost.90.tweaks.inc b/modules/x11/kspost.90.tweaks.inc
index 4f73e86..fe4165e 100644
--- a/modules/x11/kspost.90.tweaks.inc
+++ b/modules/x11/kspost.90.tweaks.inc
@@ -120,7 +120,7 @@ mkdir /etc/httpd/logs -p
 # However, a new unique pair will be generated per XO, once the user
 # creates her sugar-profile (on first startup of the XO).
 mkdir -p /home/olpc/.sugar/default
-openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" -keyout /home/olpc/.sugar/default/ssl.key -out /home/olpc/.sugar/defaul
+openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" -keyout /home/olpc/.sugar/default/ssl.key -out /home/olpc/.sugar/default/ssl.key
 
 # Replace the key- and crt-path in conf-file, so that secure-transfer may be enabled.
 #
@@ -200,6 +200,53 @@ echo "chmod 1777 /usr/local/tmp" >> $INSTALL_ROOT/etc/rc.local
 # The main fedora yum repo metadata should never expire
 sed 's/metadata_expire.*/metadata_expire=never/' /etc/yum.repos.d/fedora.repo -i
 
+# sugar-client config file customizations
+cat << EOF > /etc/sugar-client.conf
+[main]
+# url to connect to school server's RESTfull API
+api-url = http://schoolserver:8000
+# process auto-registeration on a school server on startup; multiple argument,
+# if mentioned more than once and previously registered server's IP is different
+# from "schoolserver"'s one, process re-registrtion
+auto-register = 0
+# if, after registration, there are backups to restore on the server, process
+# restore automatically
+auto-restore = False
+# if more than 0, do regular backups with specified delay in seconds
+backup-timeout = 0
+# rsync url to backup/restore Journal
+backup-url =
+# debug logging level; multiple argument
+debug = 0
+# jabber server for Sugar collaboraiton
+jabber-url =
+# specify machine's serial number instead of detecting it
+machine-sn = anonymous
+# specify machine's UUID instead of detecting it
+machine-uuid = anonymous
+# specify user's nickname instead of detecting it
+nickname = anonymous
+# school server's FQDN, will be auto-set after registration
+schoolserver =
+# CA certificates file to get access to --stats-url via HTTPS
+stats-ca-certs =
+# if more than 0 and --stats-url specified, ping stats server with specified
+# delay in seconds to coordinate stats gathering work
+stats-timeout = 300
+# stats server's http(s) url to interact with; if omited, any stats related
+# functionality is disabled
+stats-url = http://sugardextrose.org:8000
+# current user's unique identity; needs to be set only from profile
+# configuration file; will be auto-created on initial registration
+uid =
+# optional command-line arguments to pass to a packager while updating the
+# system
+update-args = --disablerepo=* --enablerepo=dextrose
+# if more than 0, do regular unattended updates with specified delay in seconds
+update-timeout = 86400
+
+EOF
+
 
 # Just making sure we didn't mess up ownerships
 chown olpc.olpc /home/olpc -R