diff --git a/feeds/tip/certificates/files/usr/bin/mount_certs b/feeds/tip/certificates/files/usr/bin/mount_certs index 1a0b1281e..cfef23ff9 100755 --- a/feeds/tip/certificates/files/usr/bin/mount_certs +++ b/feeds/tip/certificates/files/usr/bin/mount_certs @@ -4,6 +4,8 @@ check_certificates() { [ -f /certificates/cas.pem -a -f /certificates/cert.pem -a -f /certificates/key.pem ] && exit 0 } +check_certificates + . /lib/functions.sh mkdir -p /certificates /etc/ucentral/ mtd=$(find_mtd_index certificates) diff --git a/feeds/ucentral/ucentral-client/Makefile b/feeds/ucentral/ucentral-client/Makefile index e2795f0b6..e4969a46f 100644 --- a/feeds/ucentral/ucentral-client/Makefile +++ b/feeds/ucentral/ucentral-client/Makefile @@ -4,11 +4,10 @@ PKG_NAME:=ucentral-client PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git -PKG_MIRROR_HASH:=67430be7f6a4e3585979d2f9213a975314749e8f57feaa132f8d2daf0596294b -#PKG_MIRROR_HASH:=908316678065fac9624f9a0379aeff71241f526f42a598a5abf74de0a5e73520 +PKG_MIRROR_HASH:=2e71ff048f98bb9d28bb352f85745ce8256015c16c14a0719999c850cee0f3f7 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-06-22 -PKG_SOURCE_VERSION:=616e88f87affa8c07909baf460d011defddab8de +PKG_SOURCE_VERSION:=d10428a05c12cacccd3d6f4d0199fc3afc9c50b0 PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=John Crispin diff --git a/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral b/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral index 3c9cf458f..5d74373c8 100755 --- a/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral +++ b/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral @@ -16,7 +16,12 @@ reload_service() { start_service() { [ -f /etc/ucentral/capabilities.json ] || /usr/share/ucentral/capabilities.uc - + + [ -f /etc/ucentral/ucentral.cfg.0000000002 ] && { + /usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000002 > /dev/null + rm /etc/ucentral/ucentral.cfg.0000000002 + } + [ -f /tmp/ucentral.version ] || cat /etc/openwrt_release | grep DISTRIB_REVISION= | cut -d\' -f2 > /tmp/ucentral.version mkdir -p /tmp/ucentral/ diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 6aa9e5318..58745feae 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git -PKG_MIRROR_HASH:=1eb48137a2611fb1208a4ff6b6aece74cca76ae1d4b928df786f099ff31db91f +PKG_MIRROR_HASH:=246a66992df8137726f38b4cdcf463fb78ab90191b9b110b7889cd72ecef8e58 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-05-29 -PKG_SOURCE_VERSION:=b3f972ae12365d7a9e2e567f8e2a7d976d5d7276 +PKG_SOURCE_VERSION:=1fe5413ec595e697930b1e31d826bf6844b5ac74 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/feeds/ucentral/ucentral-schema/files/etc/ucentral/ucentral.cfg.0000000001 b/feeds/ucentral/ucentral-schema/files/etc/ucentral/ucentral.cfg.0000000001 index 592b0d28f..c88c6e388 100644 --- a/feeds/ucentral/ucentral-schema/files/etc/ucentral/ucentral.cfg.0000000001 +++ b/feeds/ucentral/ucentral-schema/files/etc/ucentral/ucentral.cfg.0000000001 @@ -73,7 +73,7 @@ "admin-ui": { "wifi-ssid": "Maverick", "wifi-bands": [ "5G" ], - "offline-trigger": 30, + "offline-trigger": 300, } } }