aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Golle <dangowrt@users.noreply.github.com>2019-03-07 15:15:08 +0100
committerGitHub <noreply@github.com>2019-03-07 15:15:08 +0100
commitceb39d08a06a506bff1e92b2e32e11dd1ed8824e (patch)
tree674ebd8188535a87986bcc08262fa479f346ab82
parent2d1694ff7cd9e4517483f1012d9deed1b2b710c4 (diff)
parent54a2c8d087e65ce5389586b62b2ec41f00c0c8c0 (diff)
Merge pull request #8356 from aparcar/asu-cert-server
attendedsyuspgrade-common: add key and set server
-rw-r--r--utils/attendedsysupgrade-common/Makefile7
-rw-r--r--utils/attendedsysupgrade-common/files/attendedsysupgrade.defaults2
-rw-r--r--utils/attendedsysupgrade-common/files/c06d891233ba6992
3 files changed, 8 insertions, 3 deletions
diff --git a/utils/attendedsysupgrade-common/Makefile b/utils/attendedsysupgrade-common/Makefile
index d1419ae1a..52170404b 100644
--- a/utils/attendedsysupgrade-common/Makefile
+++ b/utils/attendedsysupgrade-common/Makefile
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=attendedsysupgrade-common
-PKG_VERSION:=0.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.2
+PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
@@ -51,6 +51,9 @@ endef
define Package/attendedsysupgrade-common/install
$(INSTALL_DIR) $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/attendedsysupgrade.defaults $(1)/etc/uci-defaults/attendedsysupgrade
+
+ $(INSTALL_DIR) $(1)/etc/opkg/keys/
+ $(INSTALL_BIN) ./files/c06d891233ba699 $(1)/etc/opkg/keys/c06d891233ba699
endef
$(eval $(call BuildPackage,attendedsysupgrade-common))
diff --git a/utils/attendedsysupgrade-common/files/attendedsysupgrade.defaults b/utils/attendedsysupgrade-common/files/attendedsysupgrade.defaults
index f7fb1ebde..3d65afba3 100644
--- a/utils/attendedsysupgrade-common/files/attendedsysupgrade.defaults
+++ b/utils/attendedsysupgrade-common/files/attendedsysupgrade.defaults
@@ -6,7 +6,7 @@ touch /etc/config/attendedsysupgrade
uci -q batch <<EOF
set attendedsysupgrade.server=server
-set attendedsysupgrade.server.url='https://example.org'
+set attendedsysupgrade.server.url='https://chef.libremesh.org'
set attendedsysupgrade.client=client
set attendedsysupgrade.client.upgrade_packages='1'
diff --git a/utils/attendedsysupgrade-common/files/c06d891233ba699 b/utils/attendedsysupgrade-common/files/c06d891233ba699
new file mode 100644
index 000000000..94edfd8e1
--- /dev/null
+++ b/utils/attendedsysupgrade-common/files/c06d891233ba699
@@ -0,0 +1,2 @@
+untrusted comment: public key c06d891233ba699
+RWQMBtiRIzummeTc81jtKdJ3XwnaZGtHLRwjls0ovGsKoTnTmS7fj4Na