diff --git a/site.conf b/site.conf index e063f6517cbf50e14231a4eadb0ee2e6c9b6439b..47182bc1c9546a5181dbd0827c18f903dff1e643 100644 --- a/site.conf +++ b/site.conf @@ -98,7 +98,7 @@ }, good_signatures = 1, pubkeys = { - 'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard + '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard }, }, beta = { @@ -108,7 +108,7 @@ }, good_signatures = 1, pubkeys = { - 'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard + '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard }, }, nightly = { @@ -118,7 +118,7 @@ }, good_signatures = 1, pubkeys = { - 'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard + '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard }, }, }, diff --git a/site.mk b/site.mk index 8ab260a6d199247db0a1c23005d252577c91da3a..a53a329a942eeda8e3bfa3bc9123bd6ad7c855f3 100644 --- a/site.mk +++ b/site.mk @@ -23,7 +23,7 @@ GLUON_SITE_PACKAGES := \ iptables \ iwinfo -DEFAULT_GLUON_RELEASE := 0.2+0-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1) +DEFAULT_GLUON_RELEASE := 0.3+0-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1) # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)