From 253ce7e8f2e46e35762e5be67554815bac387c0b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 21 Jul 2014 15:43:19 +0200 Subject: [PATCH] gluon-autoupdater: adjust for new updater logic The probability field is removed, updates are performed once per night between 04:00 and 05:00. --- gluon/gluon-autoupdater/check_site.lua | 1 - .../files/lib/gluon/cron/autoupdater | 1 - .../upgrade/autoupdater/invariant/010-autoupdater | 11 ++++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 gluon/gluon-autoupdater/files/lib/gluon/cron/autoupdater diff --git a/gluon/gluon-autoupdater/check_site.lua b/gluon/gluon-autoupdater/check_site.lua index 4d6302c..1d8996f 100644 --- a/gluon/gluon-autoupdater/check_site.lua +++ b/gluon/gluon-autoupdater/check_site.lua @@ -5,7 +5,6 @@ local function check_branch(k, _) need_string(prefix .. 'name') need_string_array(prefix .. 'mirrors') - need_number(prefix .. 'probability') need_number(prefix .. 'good_signatures') need_string_array(prefix .. 'pubkeys') end diff --git a/gluon/gluon-autoupdater/files/lib/gluon/cron/autoupdater b/gluon/gluon-autoupdater/files/lib/gluon/cron/autoupdater deleted file mode 100644 index 1beebca..0000000 --- a/gluon/gluon-autoupdater/files/lib/gluon/cron/autoupdater +++ /dev/null @@ -1 +0,0 @@ -0 * * * * /usr/sbin/autoupdater diff --git a/gluon/gluon-autoupdater/files/lib/gluon/upgrade/autoupdater/invariant/010-autoupdater b/gluon/gluon-autoupdater/files/lib/gluon/upgrade/autoupdater/invariant/010-autoupdater index b205f41..5cd11c0 100755 --- a/gluon/gluon-autoupdater/files/lib/gluon/upgrade/autoupdater/invariant/010-autoupdater +++ b/gluon/gluon-autoupdater/files/lib/gluon/upgrade/autoupdater/invariant/010-autoupdater @@ -12,7 +12,6 @@ for name, config in pairs(site.autoupdater.branches) do { name = config.name, mirror = config.mirrors, - probability = config.probability, good_signatures = config.good_signatures, pubkey = config.pubkeys, } @@ -42,3 +41,13 @@ c:set('autoupdater', 'settings', 'version_file', '/lib/gluon/release') c:save('autoupdater') c:commit('autoupdater') + + +local autoupdater_util = require 'autoupdater.util' +autoupdater_util.randomseed() + + +-- Perform updates at a random time between 04:00 and 05:00 +local f = io.open('/lib/gluon/cron/autoupdater', 'w') +f:write(string.format('%i 4 * * * /usr/sbin/autoupdater\n', math.random(0, 59))) +f:close()