Added sugar-stats to all dx images

5 files changed, 21 insertions, 72 deletions

diff --git a/examples/dextrose4-xo1.5.ini b/examples/dextrose4-xo1.5.ini
index 4bc846d..1e91186 100644
--- a/examples/dextrose4-xo1.5.ini
+++ b/examples/dextrose4-xo1.5.ini
@@ -39,9 +39,6 @@ addrepo_2=1,olpc-f18-xo1.5,http://rpmdropbox.laptop.org/f18-xo1.5/
 addrepo_3=1,dextrose,http://build.activitycentral.com/devel-rpms
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
-[custom_scripts]
-custom_script_1=%(oob_config_dir)s/sugar-client-conf.sh
-
 [x11]
 
 [gnome]
@@ -141,3 +138,7 @@ add_packages=
         ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
+; Stats
+         sugar-stats
+         sugar-client
+
diff --git a/examples/dextrose4-xo1.75.ini b/examples/dextrose4-xo1.75.ini
index 9eda51f..fbca53e 100644
--- a/examples/dextrose4-xo1.75.ini
+++ b/examples/dextrose4-xo1.75.ini
@@ -37,9 +37,6 @@ addrepo_2=1,olpc-f18-xo1.75,http://rpmdropbox.laptop.org/f18-xo1.75/
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 addrepo_3=1,dextrose,http://build.activitycentral.com/devel-rpms
 
-[custom_scripts]
-custom_script_1=%(oob_config_dir)s/sugar-client-conf.sh
-
 [osk]
 
 [x11]
@@ -80,6 +77,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.75
 
@@ -138,4 +138,7 @@ add_packages=
         ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
-          
+; Stats
+         sugar-stats
+         sugar-client
+
diff --git a/examples/dextrose4-xo1.ini b/examples/dextrose4-xo1.ini
index 49bcd27..f4f5e27 100644
--- a/examples/dextrose4-xo1.ini
+++ b/examples/dextrose4-xo1.ini
@@ -39,7 +39,6 @@ add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [custom_scripts]
 custom_script_1=%(oob_config_dir)s/disable_mesh.sh
-custom_script_2=%(oob_config_dir)s/sugar-client-conf.sh
 
 [x11]
 
@@ -65,6 +64,9 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1Lite/13.1
 
+[sugar_activities_extra]
+local_dir = activities
+
 ; still too many open blockers for XO-1 idle suspend to work well
 [powerd]
 enable_idle_suspend=0
@@ -127,3 +129,7 @@ add_packages=
         ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
+; Stats
+         sugar-stats
+         sugar-client
+
diff --git a/examples/dextrose4-xo4.ini b/examples/dextrose4-xo4.ini
index d8bf5f7..cddf008 100644
--- a/examples/dextrose4-xo4.ini
+++ b/examples/dextrose4-xo4.ini
@@ -37,9 +37,6 @@ addrepo_2=1,olpc-f18-xo4,http://rpmdropbox.laptop.org/f18-xo4/
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 addrepo_3=1,dextrose,http://build.activitycentral.com/devel-rpms
 
-[custom_scripts]
-custom_script_1=%(oob_config_dir)s/sugar-client-conf.sh
-
 [osk]
 
 [x11]
@@ -80,6 +77,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-xo4
 
diff --git a/examples/sugar-client-conf.sh b/examples/sugar-client-conf.sh
deleted file mode 100755
index 45f093f..0000000
--- a/examples/sugar-client-conf.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# Copying sugar-client basic configuration to /etc/sugar-client.conf
-cat >> "${INSTALL_ROOT}/etc/sugar-client.conf" << __EOF__
-[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 = 
-# 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 = 600
-# stats server's http(s) url to interact with; if omited, any stats related
-# functionality is disabled
-stats-url = http://localhost: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 --enablerepo=dextrose-next
-# if more than 0, do regular unattended updates with specified delay in seconds
-update-timeout = 86400
-__EOF__
-
-
-# Enabling sugar-client session at startup
-cat >> "${INSTALL_ROOT}/home/olpc/.xsession" << __EOF__
-
-# Enabling sugar-client session at sugar startup
-sugar-client session
-
-# Performing xmodmap customizations
-xmodmap xmodmap.conf
-
-
-__EOF__
-