Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Silva <sebastian@somosazucar.org>2013-10-03 06:30:54 (GMT)
committer Sebastian Silva <sebastian@somosazucar.org>2013-10-03 06:30:54 (GMT)
commit77cfb394b4dda6c5a950f95bd9c2bc00414a03f8 (patch)
treec0f02009dc7b4fd11d1d1343b8a9d928f0eedcc8
parente1fd44920a5ce340673edb8c85637c793adee638 (diff)
prereleasetesting
-rw-r--r--etc/sweets.conf6
-rw-r--r--image/common.ini9
2 files changed, 8 insertions, 7 deletions
diff --git a/etc/sweets.conf b/etc/sweets.conf
index 6780755..3067be7 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -5,7 +5,7 @@
[shell]
# Space separated list of plugins to enable.
# To upload users' stats to a Sugar Network node, add "stats" plugin.
-plugins = telepathy proxy sn stats
+plugins = telepathy proxy sn stats upgrade
#[webui]
# this is for testing only, allows for easier automatic testing
@@ -23,7 +23,7 @@ cpsection =
# http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client
[client]
# url to connect to Sugar Network server API
-api-url = http://node.sugarlabs.org
+#api-url = http://node.sugarlabs.org
# space separated list of layers to restrict Sugar Network content by
# for now, "pilot" layer is being used to QA most useful/stable activities
layers = pilot
@@ -48,4 +48,4 @@ stats-timeout = 3600
# Default parameters for sugar-plugin-upgrade package
[sugar-plugin-upgrade]
# if more than 0, do regular unattended system update with specified delay in seconds
-upgrade-timeout = 0
+upgrade-timeout = 86400
diff --git a/image/common.ini b/image/common.ini
index 4e1517e..90ff389 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -67,7 +67,7 @@ offline_activities =
org.laptop.WebActivity,
org.laptop.Calculate,
org.laptop.Chat,
- org.vpri.EtoysActivity,
+# org.vpri.EtoysActivity,
org.laptop.ImageViewerActivity,
org.laptop.sugar.Jukebox,
org.laptop.sugar.ReadActivity,
@@ -81,17 +81,17 @@ offline_activities =
org.laptop.RecordActivity,
org.laptop.Oficina,
com.jotaro.ImplodeActivity,
- org.laptop.physics,
+# org.laptop.physics,
org.laptop.MeasureActivity,
org.somosazucar.ServidorVNC,
#net.gcompris,
- edu.mit.media.ScratchActivity,
+# edu.mit.media.ScratchActivity,
org.ceibaljam.conozcoamerica,
org.sugarlabs.ICanReadActivity,
org.sugarlabs.SimpleGraph,
org.laptop.TurtleArtButia,
vu.lux.olpc.Speak,
- org.laptop.WikipediaActivity,
+# org.laptop.WikipediaActivity,
#org.laptop.WikipediaActivityQU,
mulawa.Sudoku
@@ -119,6 +119,7 @@ add_packages =
# `deployment.rpm` and spreading it via Sugar Network nodes.
deployment-testing,
sugar-plugin-stats,
+ sugar-plugin-upgrade,
sugar-stats,
# Useful packages from rpmfusion repository.
gstreamer-plugins-ugly,