From 4dfbcb24097ab1f4f56ee928d604d4df9289b5a2 Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Tue, 21 May 2019 10:34:22 +0200 Subject: [PATCH 01/10] Stop sending Broker/Handler data to NOC --- core/broker/activation.go | 6 +++--- core/broker/broker.go | 10 ++++------ core/broker/downlink.go | 6 +++--- core/broker/uplink.go | 6 +++--- core/handler/activation.go | 6 +++--- core/handler/downlink.go | 6 +++--- core/handler/handler.go | 12 +++++------- core/handler/uplink.go | 6 +++--- core/networkserver/networkserver.go | 19 ++++++++----------- core/router/router.go | 19 +++++++++---------- 10 files changed, 44 insertions(+), 52 deletions(-) diff --git a/core/broker/activation.go b/core/broker/activation.go index 8c83b97f3..925b2bf84 100644 --- a/core/broker/activation.go +++ b/core/broker/activation.go @@ -45,9 +45,9 @@ func (b *broker) HandleActivation(activation *pb.DeviceActivationRequest) (res * b.RegisterHandled(activation) ctx.WithField("Duration", time.Now().Sub(start)).Info("Handled activation") } - if deduplicatedActivationRequest != nil && b.monitorStream != nil { - b.monitorStream.Send(deduplicatedActivationRequest) - } + // if deduplicatedActivationRequest != nil && b.monitorStream != nil { + // b.monitorStream.Send(deduplicatedActivationRequest) + // } }() b.status.activations.Mark(1) diff --git a/core/broker/broker.go b/core/broker/broker.go index 3510c1a16..f6fcfa58b 100644 --- a/core/broker/broker.go +++ b/core/broker/broker.go @@ -10,10 +10,8 @@ import ( "time" pb "github.com/TheThingsNetwork/api/broker" - "github.com/TheThingsNetwork/api/monitor/monitorclient" "github.com/TheThingsNetwork/api/networkserver" pb_lorawan "github.com/TheThingsNetwork/api/protocol/lorawan" - "github.com/TheThingsNetwork/go-utils/grpc/auth" "github.com/TheThingsNetwork/ttn/api" "github.com/TheThingsNetwork/ttn/core/component" "github.com/TheThingsNetwork/ttn/core/types" @@ -66,7 +64,7 @@ type broker struct { uplinkDeduplicator Deduplicator activationDeduplicator Deduplicator status *status - monitorStream monitorclient.Stream + // monitorStream monitorclient.Stream } func (b *broker) checkPrefixAnnouncements() error { @@ -135,9 +133,9 @@ func (b *broker) Init(c *component.Component) error { b.ns = networkserver.NewNetworkServerClient(conn) b.checkPrefixAnnouncements() b.Component.SetStatus(component.StatusHealthy) - if b.Component.Monitor != nil { - b.monitorStream = b.Component.Monitor.BrokerClient(b.Context, grpc.PerRPCCredentials(auth.WithStaticToken(b.AccessToken))) - } + // if b.Component.Monitor != nil { + // b.monitorStream = b.Component.Monitor.BrokerClient(b.Context, grpc.PerRPCCredentials(auth.WithStaticToken(b.AccessToken))) + // } return nil } diff --git a/core/broker/downlink.go b/core/broker/downlink.go index 83b5fb913..f2b7f79cf 100644 --- a/core/broker/downlink.go +++ b/core/broker/downlink.go @@ -33,9 +33,9 @@ func (b *broker) HandleDownlink(downlink *pb.DownlinkMessage) error { b.RegisterHandled(downlink) ctx.WithField("Duration", time.Now().Sub(start)).Info("Handled downlink") } - if downlink != nil && b.monitorStream != nil { - b.monitorStream.Send(downlink) - } + // if downlink != nil && b.monitorStream != nil { + // b.monitorStream.Send(downlink) + // } }() b.status.downlink.Mark(1) diff --git a/core/broker/uplink.go b/core/broker/uplink.go index 333fe15b4..882199d4f 100644 --- a/core/broker/uplink.go +++ b/core/broker/uplink.go @@ -42,9 +42,9 @@ func (b *broker) HandleUplink(uplink *pb.UplinkMessage) (err error) { b.RegisterHandled(uplink) ctx.WithField("Duration", time.Now().Sub(start)).Info("Handled uplink") } - if deduplicatedUplink != nil && b.monitorStream != nil { - b.monitorStream.Send(deduplicatedUplink) - } + // if deduplicatedUplink != nil && b.monitorStream != nil { + // b.monitorStream.Send(deduplicatedUplink) + // } }() b.status.uplink.Mark(1) diff --git a/core/handler/activation.go b/core/handler/activation.go index 4e1d67933..3214da302 100644 --- a/core/handler/activation.go +++ b/core/handler/activation.go @@ -95,9 +95,9 @@ func (h *handler) HandleActivation(activation *pb_broker.DeduplicatedDeviceActiv h.RegisterHandled(activation) ctx.WithField("Duration", time.Now().Sub(start)).Info("Handled activation") } - if activation != nil && h.monitorStream != nil { - h.monitorStream.Send(activation) - } + // if activation != nil && h.monitorStream != nil { + // h.monitorStream.Send(activation) + // } }() h.status.activations.Mark(1) diff --git a/core/handler/downlink.go b/core/handler/downlink.go index 7f2df8ba7..70dd4674d 100644 --- a/core/handler/downlink.go +++ b/core/handler/downlink.go @@ -123,9 +123,9 @@ func (h *handler) HandleDownlink(appDownlink *types.DownlinkMessage, downlink *p ctx.WithError(err).Warn("Could not handle downlink") downlink.Trace = downlink.Trace.WithEvent(trace.DropEvent, "reason", err) } - if downlink != nil && h.monitorStream != nil { - h.monitorStream.Send(downlink) - } + // if downlink != nil && h.monitorStream != nil { + // h.monitorStream.Send(downlink) + // } }() dev, err := h.devices.Get(appID, devID) diff --git a/core/handler/handler.go b/core/handler/handler.go index b81a7c532..209ececc1 100644 --- a/core/handler/handler.go +++ b/core/handler/handler.go @@ -9,9 +9,7 @@ import ( pb_broker "github.com/TheThingsNetwork/api/broker" "github.com/TheThingsNetwork/api/broker/brokerclient" pb "github.com/TheThingsNetwork/api/handler" - "github.com/TheThingsNetwork/api/monitor/monitorclient" pb_lorawan "github.com/TheThingsNetwork/api/protocol/lorawan" - "github.com/TheThingsNetwork/go-utils/grpc/auth" "github.com/TheThingsNetwork/ttn/amqp" "github.com/TheThingsNetwork/ttn/core/component" "github.com/TheThingsNetwork/ttn/core/handler/application" @@ -82,8 +80,8 @@ type handler struct { qUp chan *types.UplinkMessage qEvent chan *types.DeviceEvent - status *status - monitorStream monitorclient.Stream + status *status + // monitorStream monitorclient.Stream } var ( @@ -171,9 +169,9 @@ func (h *handler) Init(c *component.Component) error { } h.Component.SetStatus(component.StatusHealthy) - if h.Component.Monitor != nil { - h.monitorStream = h.Component.Monitor.HandlerClient(h.Context, grpc.PerRPCCredentials(auth.WithStaticToken(h.AccessToken))) - } + // if h.Component.Monitor != nil { + // h.monitorStream = h.Component.Monitor.HandlerClient(h.Context, grpc.PerRPCCredentials(auth.WithStaticToken(h.AccessToken))) + // } return nil } diff --git a/core/handler/uplink.go b/core/handler/uplink.go index 010e1e554..bda4230cb 100644 --- a/core/handler/uplink.go +++ b/core/handler/uplink.go @@ -35,9 +35,9 @@ func (h *handler) HandleUplink(uplink *pb_broker.DeduplicatedUplinkMessage) (err h.RegisterHandled(uplink) ctx.WithField("Duration", time.Now().Sub(start)).Info("Handled uplink") } - if uplink != nil && h.monitorStream != nil { - h.monitorStream.Send(uplink) - } + // if uplink != nil && h.monitorStream != nil { + // h.monitorStream.Send(uplink) + // } }() h.status.uplink.Mark(1) diff --git a/core/networkserver/networkserver.go b/core/networkserver/networkserver.go index 795fa5420..af0359c04 100644 --- a/core/networkserver/networkserver.go +++ b/core/networkserver/networkserver.go @@ -6,14 +6,11 @@ package networkserver import ( pb_broker "github.com/TheThingsNetwork/api/broker" pb_handler "github.com/TheThingsNetwork/api/handler" - "github.com/TheThingsNetwork/api/monitor/monitorclient" pb "github.com/TheThingsNetwork/api/networkserver" - "github.com/TheThingsNetwork/go-utils/grpc/auth" "github.com/TheThingsNetwork/ttn/core/component" "github.com/TheThingsNetwork/ttn/core/networkserver/device" "github.com/TheThingsNetwork/ttn/core/types" "github.com/TheThingsNetwork/ttn/utils/errors" - "google.golang.org/grpc" "gopkg.in/redis.v5" ) @@ -44,11 +41,11 @@ func NewRedisNetworkServer(client *redis.Client, netID int) NetworkServer { type networkServer struct { *component.Component - devices device.Store - netID [3]byte - prefixes map[types.DevAddrPrefix][]string - status *status - monitorStream monitorclient.Stream + devices device.Store + netID [3]byte + prefixes map[types.DevAddrPrefix][]string + status *status + // monitorStream monitorclient.Stream } func (n *networkServer) UsePrefix(prefix types.DevAddrPrefix, usage []string) error { @@ -88,9 +85,9 @@ func (n *networkServer) Init(c *component.Component) error { return err } n.Component.SetStatus(component.StatusHealthy) - if n.Component.Monitor != nil { - n.monitorStream = n.Component.Monitor.NetworkServerClient(n.Context, grpc.PerRPCCredentials(auth.WithStaticToken(n.AccessToken))) - } + // if n.Component.Monitor != nil { + // n.monitorStream = n.Component.Monitor.NetworkServerClient(n.Context, grpc.PerRPCCredentials(auth.WithStaticToken(n.AccessToken))) + // } return nil } diff --git a/core/router/router.go b/core/router/router.go index 767dde7be..c1b3a322c 100644 --- a/core/router/router.go +++ b/core/router/router.go @@ -11,7 +11,6 @@ import ( "github.com/TheThingsNetwork/api/broker/brokerclient" pb_discovery "github.com/TheThingsNetwork/api/discovery" pb_gateway "github.com/TheThingsNetwork/api/gateway" - "github.com/TheThingsNetwork/api/monitor/monitorclient" pb "github.com/TheThingsNetwork/api/router" "github.com/TheThingsNetwork/go-utils/grpc/auth" "github.com/TheThingsNetwork/go-utils/grpc/ttnctx" @@ -60,12 +59,12 @@ func NewRouter() Router { type router struct { *component.Component - gateways map[string]*gateway.Gateway - gatewaysLock sync.RWMutex - brokers map[string]*broker - brokersLock sync.RWMutex - status *status - monitorStream monitorclient.Stream + gateways map[string]*gateway.Gateway + gatewaysLock sync.RWMutex + brokers map[string]*broker + brokersLock sync.RWMutex + status *status + // monitorStream monitorclient.Stream } func (r *router) tickGateways() { @@ -95,9 +94,9 @@ func (r *router) Init(c *component.Component) error { } }() r.Component.SetStatus(component.StatusHealthy) - if r.Component.Monitor != nil { - r.monitorStream = r.Component.Monitor.RouterClient(r.Context, grpc.PerRPCCredentials(auth.WithStaticToken(r.AccessToken))) - } + // if r.Component.Monitor != nil { + // r.monitorStream = r.Component.Monitor.RouterClient(r.Context, grpc.PerRPCCredentials(auth.WithStaticToken(r.AccessToken))) + // } return nil } From b98b0224ceb0b39c93c5ed12b1f6760c0eb1251d Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Tue, 21 May 2019 10:52:10 +0200 Subject: [PATCH 02/10] Tidy go modules --- go.mod | 8 +++++--- go.sum | 17 +++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index cd440a4ef..a94a9f66d 100644 --- a/go.mod +++ b/go.mod @@ -7,17 +7,19 @@ replace github.com/brocaar/lorawan => github.com/ThethingsIndustries/legacy-lora replace github.com/robertkrimen/otto => github.com/ThethingsIndustries/otto v0.0.0-20181129100957-6ddbbb60554a require ( - github.com/TheThingsNetwork/api v0.0.0-20190516145942-631860935c2b + github.com/TheThingsNetwork/api v0.0.0-20190517100736-d4d18a220bfe github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875 github.com/TheThingsNetwork/go-cayenne-lib v1.0.0 github.com/TheThingsNetwork/go-utils v0.0.0-20190516083235-bdd4967fab4e github.com/TheThingsNetwork/ttn/api v0.0.0-20190516093004-b66899428ed5 - github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190516093004-b66899428ed5 + github.com/TheThingsNetwork/ttn/core/proxy v0.0.0-20190520085727-78600a8e394e + github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190517101034-52d38c791f1e github.com/TheThingsNetwork/ttn/mqtt v0.0.0-20190516093004-b66899428ed5 github.com/TheThingsNetwork/ttn/utils/errors v0.0.0-20190516093004-b66899428ed5 github.com/TheThingsNetwork/ttn/utils/random v0.0.0-20190516093004-b66899428ed5 github.com/TheThingsNetwork/ttn/utils/security v0.0.0-20190516093004-b66899428ed5 - github.com/TheThingsNetwork/ttn/utils/testing v0.0.0-20190516093004-b66899428ed5 + github.com/TheThingsNetwork/ttn/utils/testing v0.0.0-20190520084050-7adf4a69a7c3 + github.com/TheThingsNetwork/ttn/utils/toa v0.0.0-20190520085727-78600a8e394e github.com/apex/log v1.1.0 github.com/bluele/gcache v0.0.0-20190301044115-79ae3b2d8680 github.com/brocaar/lorawan v0.0.0-20170626123636-a64aca28516d diff --git a/go.sum b/go.sum index 50817e532..d4651cfed 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrU github.com/TheThingsNetwork/api v0.0.0-20190330165854-3fb363b63d07/go.mod h1:iGcCXFi0My4IJbLSWWlRONaYiMtSjLbdkfFE5xBrgRc= github.com/TheThingsNetwork/api v0.0.0-20190516085542-c732802571cf h1:1LvY2VUOy+/Sb5O8eE2HIecvUZupe7kLoquUpeajuPs= github.com/TheThingsNetwork/api v0.0.0-20190516085542-c732802571cf/go.mod h1:XO2/81Njy3JefUFXtTg63YGJJ2wUyMRyYm6LaYfu8jE= -github.com/TheThingsNetwork/api v0.0.0-20190516145942-631860935c2b h1:freUS8NvlSFKjjetQlMbfztZ+Vq7Dku5cn1o0Nfn4HI= -github.com/TheThingsNetwork/api v0.0.0-20190516145942-631860935c2b/go.mod h1:MYWz0xDXK+4LWQMnAcm//UPhLoamf67LgFjMwUdhKbE= +github.com/TheThingsNetwork/api v0.0.0-20190517100736-d4d18a220bfe h1:TZYyhGnPysXUkq9O2+X/Q3sx6AoWe/69vUg2UHhs5Xs= +github.com/TheThingsNetwork/api v0.0.0-20190517100736-d4d18a220bfe/go.mod h1:OOsQiPf+uTrA9HFid7qvaoUF41F2dMsNMeMr81iBx3s= github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875 h1:Q6gqExgAk2mQlZPur7dwbGsy9Uxs9Hs2kurMTd+o2Rc= github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875/go.mod h1:VZeXL6kkGnZouPnLESpVSGSRQNlz8zAOKHzr0P6m4pc= github.com/TheThingsNetwork/go-cayenne-lib v1.0.0 h1:be7h6E/69+qaYs1iwQ2xjGjSFPXzvU3q6AWBCWayG2Y= @@ -19,10 +19,12 @@ github.com/TheThingsNetwork/go-utils v0.0.0-20190516083235-bdd4967fab4e/go.mod h github.com/TheThingsNetwork/ttn/api v0.0.0-20190516081709-034d40b328bd/go.mod h1:UCRXmEaShvS/wHOf2RcoY2vKUGJnrYrotBA6LZzYdFM= github.com/TheThingsNetwork/ttn/api v0.0.0-20190516093004-b66899428ed5 h1:CWZxNG3BP+51XnsImFuBxWABdU+y2GVPzF4daWu3Sp4= github.com/TheThingsNetwork/ttn/api v0.0.0-20190516093004-b66899428ed5/go.mod h1:UCz6JjSI/HZZjHu/TcfbI0p+76D7IUUtyX9nd3Byq1Y= +github.com/TheThingsNetwork/ttn/core/proxy v0.0.0-20190520085727-78600a8e394e h1:56aZuiGKNhlUhE2SuEOjVpI1+9IpI3LUTHHG9J4vhnQ= +github.com/TheThingsNetwork/ttn/core/proxy v0.0.0-20190520085727-78600a8e394e/go.mod h1:x2G/70+ZSTn52jF19DReMBWPvMCuNSyvQpJiMOIApkg= github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190516081709-034d40b328bd/go.mod h1:VVWTaeAJHezuE+c0Vk0AJ4R6KSLg50H1y3RB7vGhGOA= github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190516092602-86414c703ee1/go.mod h1:q3r/3g5fixboWUOCounAWo+Y8OlkKdhVnGosLMEQ09Q= -github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190516093004-b66899428ed5 h1:zNnH7q0VV6xKZbnREHhkTVU52r5WZgCEZAEC2qSj/UQ= -github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190516093004-b66899428ed5/go.mod h1:q3r/3g5fixboWUOCounAWo+Y8OlkKdhVnGosLMEQ09Q= +github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190517101034-52d38c791f1e h1:+En3gSQgpfHQ3mpXhqHlyAryyvvmBX0Uy+k/5TgcbCM= +github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190517101034-52d38c791f1e/go.mod h1:q3r/3g5fixboWUOCounAWo+Y8OlkKdhVnGosLMEQ09Q= github.com/TheThingsNetwork/ttn/mqtt v0.0.0-20190516093004-b66899428ed5 h1:Akg8xikJB5eko/Be/nbionUtWYsYybIWQdmEm+7KKfA= github.com/TheThingsNetwork/ttn/mqtt v0.0.0-20190516093004-b66899428ed5/go.mod h1:reZ1DGzwREWfUapXIyMWU4Ybj8yxB3DD6zBW5Onm2Z0= github.com/TheThingsNetwork/ttn/utils/errors v0.0.0-20190516081709-034d40b328bd/go.mod h1:e8FjzgvhAVx9+iqPloB4v7QM0rmv+r5ysRn9kWFamG4= @@ -36,8 +38,10 @@ github.com/TheThingsNetwork/ttn/utils/security v0.0.0-20190516081709-034d40b328b github.com/TheThingsNetwork/ttn/utils/security v0.0.0-20190516093004-b66899428ed5 h1:OjekQ5jxJPKA2LAOIjLe/GVeE1TSrOXsTXiQD2e4z7E= github.com/TheThingsNetwork/ttn/utils/security v0.0.0-20190516093004-b66899428ed5/go.mod h1:aNjkY4wOHP4vKYouzSgvX/BhmsC8RqqZKPbrVqUNMls= github.com/TheThingsNetwork/ttn/utils/testing v0.0.0-20190516092602-86414c703ee1/go.mod h1:KE2xKKLXyXmH9KBkUWJD5XPI0K10T2tj7E1kBLHq8kQ= -github.com/TheThingsNetwork/ttn/utils/testing v0.0.0-20190516093004-b66899428ed5 h1:CDF7OzmynCNYYK9UoNm/3J4gniOrVub1nBkRHCkVSos= -github.com/TheThingsNetwork/ttn/utils/testing v0.0.0-20190516093004-b66899428ed5/go.mod h1:KE2xKKLXyXmH9KBkUWJD5XPI0K10T2tj7E1kBLHq8kQ= +github.com/TheThingsNetwork/ttn/utils/testing v0.0.0-20190520084050-7adf4a69a7c3 h1:WJLOi7cMSTbMt2VPaxI79CKpGPaqMgv0X4frOLGiye0= +github.com/TheThingsNetwork/ttn/utils/testing v0.0.0-20190520084050-7adf4a69a7c3/go.mod h1:KE2xKKLXyXmH9KBkUWJD5XPI0K10T2tj7E1kBLHq8kQ= +github.com/TheThingsNetwork/ttn/utils/toa v0.0.0-20190520085727-78600a8e394e h1:Iu8eMBiLkfEgjKdwoO3DHasOdN+mkjElVpJ7o6v8o4g= +github.com/TheThingsNetwork/ttn/utils/toa v0.0.0-20190520085727-78600a8e394e/go.mod h1:/GEFY+hfpZiRck+kTkemv6oBL+X9VqBQOVsuXiAj5LU= github.com/ThethingsIndustries/legacy-lorawan-lib v0.0.0-20190212122748-b905ab327304 h1:/cHHaFovakFEXICcgyA9KdVaEISYbgNSGznVsrJKJcI= github.com/ThethingsIndustries/legacy-lorawan-lib v0.0.0-20190212122748-b905ab327304/go.mod h1:EvMP/9LQnOpO1MsMXMuZB9FpzcK504XKlpDnBHox9nI= github.com/ThethingsIndustries/otto v0.0.0-20181129100957-6ddbbb60554a h1:OgIt3d0PKh4q6kU+/d0ZWJF7PogxxE/EWOqISahT/Ic= @@ -255,6 +259,7 @@ golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From b68db69b0f0c8dedd815e08e0d10d64e384cb65c Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Wed, 22 May 2019 13:33:06 +0200 Subject: [PATCH 03/10] Update api vendor --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a94a9f66d..c96764ef4 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace github.com/brocaar/lorawan => github.com/ThethingsIndustries/legacy-lora replace github.com/robertkrimen/otto => github.com/ThethingsIndustries/otto v0.0.0-20181129100957-6ddbbb60554a require ( - github.com/TheThingsNetwork/api v0.0.0-20190517100736-d4d18a220bfe + github.com/TheThingsNetwork/api v0.0.0-20190522113053-d844e8c040fc github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875 github.com/TheThingsNetwork/go-cayenne-lib v1.0.0 github.com/TheThingsNetwork/go-utils v0.0.0-20190516083235-bdd4967fab4e diff --git a/go.sum b/go.sum index d4651cfed..514b14bf4 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrU github.com/TheThingsNetwork/api v0.0.0-20190330165854-3fb363b63d07/go.mod h1:iGcCXFi0My4IJbLSWWlRONaYiMtSjLbdkfFE5xBrgRc= github.com/TheThingsNetwork/api v0.0.0-20190516085542-c732802571cf h1:1LvY2VUOy+/Sb5O8eE2HIecvUZupe7kLoquUpeajuPs= github.com/TheThingsNetwork/api v0.0.0-20190516085542-c732802571cf/go.mod h1:XO2/81Njy3JefUFXtTg63YGJJ2wUyMRyYm6LaYfu8jE= -github.com/TheThingsNetwork/api v0.0.0-20190517100736-d4d18a220bfe h1:TZYyhGnPysXUkq9O2+X/Q3sx6AoWe/69vUg2UHhs5Xs= -github.com/TheThingsNetwork/api v0.0.0-20190517100736-d4d18a220bfe/go.mod h1:OOsQiPf+uTrA9HFid7qvaoUF41F2dMsNMeMr81iBx3s= +github.com/TheThingsNetwork/api v0.0.0-20190522113053-d844e8c040fc h1:hDk+SAT2tV584ye1hqMN5+NHL6RHJDIbe97cNot6/WQ= +github.com/TheThingsNetwork/api v0.0.0-20190522113053-d844e8c040fc/go.mod h1:OOsQiPf+uTrA9HFid7qvaoUF41F2dMsNMeMr81iBx3s= github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875 h1:Q6gqExgAk2mQlZPur7dwbGsy9Uxs9Hs2kurMTd+o2Rc= github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875/go.mod h1:VZeXL6kkGnZouPnLESpVSGSRQNlz8zAOKHzr0P6m4pc= github.com/TheThingsNetwork/go-cayenne-lib v1.0.0 h1:be7h6E/69+qaYs1iwQ2xjGjSFPXzvU3q6AWBCWayG2Y= From 1425501427da1c1d9a66a27c6014ced068571af5 Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Fri, 5 Jul 2019 10:07:41 +0200 Subject: [PATCH 04/10] Make NetworkServer keep track of Initial ADR ACK --- core/networkserver/adr.go | 3 ++- core/networkserver/adr_test.go | 26 ++++++++++++++++++++------ core/networkserver/device/device.go | 9 +++++---- core/networkserver/uplink_mac.go | 1 + 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/core/networkserver/adr.go b/core/networkserver/adr.go index fd3e64926..4156789a0 100644 --- a/core/networkserver/adr.go +++ b/core/networkserver/adr.go @@ -51,6 +51,7 @@ func (n *networkServer) handleUplinkADR(message *pb_broker.DeduplicatedUplinkMes return err } dev.ADR.SentInitial = false + dev.ADR.ConfirmedInitial = false dev.ADR.SendReq = false dev.ADR.DataRate = "" dev.ADR.TxPower = 0 @@ -106,7 +107,7 @@ func (n *networkServer) handleUplinkADR(message *pb_broker.DeduplicatedUplinkMes var forceADR bool - if !dev.ADR.SentInitial && (dev.ADR.Band == pb_lorawan.FrequencyPlan_US_902_928.String() || dev.ADR.Band == pb_lorawan.FrequencyPlan_AU_915_928.String()) { + if !dev.ADR.ConfirmedInitial && (dev.ADR.Band == pb_lorawan.FrequencyPlan_US_902_928.String() || dev.ADR.Band == pb_lorawan.FrequencyPlan_AU_915_928.String()) { dev.ADR.SendReq = true forceADR = true message.Trace = message.Trace.WithEvent(ScheduleMACEvent, macCMD, "link-adr", "reason", "initial") diff --git a/core/networkserver/adr_test.go b/core/networkserver/adr_test.go index 8e620d27e..aadcb9df7 100644 --- a/core/networkserver/adr_test.go +++ b/core/networkserver/adr_test.go @@ -167,13 +167,13 @@ func TestADR(t *testing.T) { uplink, downlink := adrInitUplinkMessage(), adrInitDownlinkMessage() uplink.ProtocolMetadata.GetLoRaWAN().FrequencyPlan = pb_lorawan.FrequencyPlan(pb_lorawan.FrequencyPlan_value[tt.Band]) - err := ns.handleUplinkADR(uplink, dev) + err := ns.handleUplinkMAC(uplink, dev) a.So(err, ShouldBeNil) a.So(dev.ADR.SendReq, ShouldBeFalse) uplink.Message.GetLoRaWAN().GetMACPayload().ADR = true - err = ns.handleUplinkADR(uplink, dev) + err = ns.handleUplinkMAC(uplink, dev) a.So(err, ShouldBeNil) a.So(dev.ADR.SendReq, ShouldBeTrue) a.So(dev.ADR.DataRate, ShouldEqual, tt.DesiredInitialDataRate) @@ -183,7 +183,7 @@ func TestADR(t *testing.T) { a.So(err, ShouldBeNil) a.So(frames, ShouldHaveLength, 1) - err = ns.handleDownlinkADR(downlink, dev) + err = ns.handleDownlinkMAC(downlink, dev) a.So(err, ShouldBeNil) a.So(dev.ADR.SentInitial, ShouldBeTrue) @@ -230,10 +230,24 @@ func TestADR(t *testing.T) { } for i := 0; i < 20; i++ { + if i == 0 { + ans, _ := lorawan.LinkADRAnsPayload{ + ChannelMaskACK: true, + DataRateACK: true, + PowerACK: true, + }.MarshalBinary() + uplink.Message.GetLoRaWAN().GetMACPayload().FOpts = []pb_lorawan.MACCommand{ + {CID: uint32(lorawan.LinkADRAns), Payload: ans}, + } + } else { + uplink.Message.GetLoRaWAN().GetMACPayload().FOpts = []pb_lorawan.MACCommand{} + } uplink.Message.GetLoRaWAN().GetMACPayload().FCnt++ - ns.handleUplinkADR(uplink, dev) + ns.handleUplinkMAC(uplink, dev) } + a.So(dev.ADR.ConfirmedInitial, ShouldBeTrue) + frames, err = history.Get() a.So(err, ShouldBeNil) a.So(frames, ShouldHaveLength, 20) @@ -242,7 +256,7 @@ func TestADR(t *testing.T) { a.So(dev.ADR.DataRate, ShouldEqual, tt.DesiredDataRate) a.So(dev.ADR.TxPower, ShouldEqual, tt.DesiredTxPower) - err = ns.handleDownlinkADR(downlink, dev) + err = ns.handleDownlinkMAC(downlink, dev) a.So(err, ShouldBeNil) fOpts = downlink.Message.GetLoRaWAN().GetMACPayload().FOpts @@ -260,7 +274,7 @@ func TestADR(t *testing.T) { uplink.ProtocolMetadata.GetLoRaWAN().DataRate = tt.DesiredDataRate uplink.GatewayMetadata[0].SNR = 7.5 - err = ns.handleUplinkADR(uplink, dev) + err = ns.handleUplinkMAC(uplink, dev) a.So(err, ShouldBeNil) a.So(dev.ADR.SendReq, ShouldBeFalse) diff --git a/core/networkserver/device/device.go b/core/networkserver/device/device.go index cd2bf06f9..bed9c22de 100644 --- a/core/networkserver/device/device.go +++ b/core/networkserver/device/device.go @@ -46,10 +46,11 @@ type ADRSettings struct { Margin int `redis:"margin"` // Indicates whether the NetworkServer should send a LinkADRReq when possible - SentInitial bool `redis:"sent_initial"` - SendReq bool `redis:"send_req"` - ExpectRes bool `redis:"expect_res"` - Failed int `redis:"failed"` // number of failed ADR attempts + SentInitial bool `redis:"sent_initial"` + ConfirmedInitial bool `redis:"confirmed_initial"` + SendReq bool `redis:"send_req"` + ExpectRes bool `redis:"expect_res"` + Failed int `redis:"failed"` // number of failed ADR attempts // Desired Settings: DataRate string `redis:"data_rate"` diff --git a/core/networkserver/uplink_mac.go b/core/networkserver/uplink_mac.go index 45fcedce5..a10457660 100644 --- a/core/networkserver/uplink_mac.go +++ b/core/networkserver/uplink_mac.go @@ -64,6 +64,7 @@ func (n *networkServer) handleUplinkMAC(message *pb_broker.DeduplicatedUplinkMes if answer.DataRateACK && answer.PowerACK && answer.ChannelMaskACK { dev.ADR.Failed = 0 dev.ADR.SendReq = false + dev.ADR.ConfirmedInitial = true ctx.WithFields(log.Fields{ "DataRate": dev.ADR.DataRate, "TxPower": dev.ADR.TxPower, From a4a898f14050f5242b1c5363dd84f52ef5ef7393 Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Tue, 13 Aug 2019 13:33:29 +0200 Subject: [PATCH 05/10] Update go-utils --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c96764ef4..606c862a7 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/TheThingsNetwork/api v0.0.0-20190522113053-d844e8c040fc github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875 github.com/TheThingsNetwork/go-cayenne-lib v1.0.0 - github.com/TheThingsNetwork/go-utils v0.0.0-20190516083235-bdd4967fab4e + github.com/TheThingsNetwork/go-utils v0.0.0-20190813113035-8715cf82e887 github.com/TheThingsNetwork/ttn/api v0.0.0-20190516093004-b66899428ed5 github.com/TheThingsNetwork/ttn/core/proxy v0.0.0-20190520085727-78600a8e394e github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190517101034-52d38c791f1e diff --git a/go.sum b/go.sum index 514b14bf4..b24f42c84 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,8 @@ github.com/TheThingsNetwork/go-cayenne-lib v1.0.0/go.mod h1:Lkg0oDuFTF6WlZvyPV35 github.com/TheThingsNetwork/go-utils v0.0.0-20190331064810-aa2a11bd5910/go.mod h1:ux1QZ2JrltnJxuZ0VoNbJP1k8Eb5jiMkR3RGDXyBS+o= github.com/TheThingsNetwork/go-utils v0.0.0-20190516083235-bdd4967fab4e h1:JEt3G2ONKGfW1YDp2A8Q/+kZIuIB117nkit0+GDJN04= github.com/TheThingsNetwork/go-utils v0.0.0-20190516083235-bdd4967fab4e/go.mod h1:9uzg7Jk8ywYqL+xUEhTNrJcs68Nafj4qTaz/zB+STwg= +github.com/TheThingsNetwork/go-utils v0.0.0-20190813113035-8715cf82e887 h1:DF/1gkOPk3jtwWa9dFd5tUtwb6z3bLw9tZ/UALbS5Ck= +github.com/TheThingsNetwork/go-utils v0.0.0-20190813113035-8715cf82e887/go.mod h1:9uzg7Jk8ywYqL+xUEhTNrJcs68Nafj4qTaz/zB+STwg= github.com/TheThingsNetwork/ttn/api v0.0.0-20190516081709-034d40b328bd/go.mod h1:UCRXmEaShvS/wHOf2RcoY2vKUGJnrYrotBA6LZzYdFM= github.com/TheThingsNetwork/ttn/api v0.0.0-20190516093004-b66899428ed5 h1:CWZxNG3BP+51XnsImFuBxWABdU+y2GVPzF4daWu3Sp4= github.com/TheThingsNetwork/ttn/api v0.0.0-20190516093004-b66899428ed5/go.mod h1:UCz6JjSI/HZZjHu/TcfbI0p+76D7IUUtyX9nd3Byq1Y= From 02dd4c77ca2d6c5197b5fb86e5a91c729923d077 Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Tue, 13 Aug 2019 13:48:11 +0200 Subject: [PATCH 06/10] Increase maximum unavailable time, add logging --- core/discovery/connectivity.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/discovery/connectivity.go b/core/discovery/connectivity.go index a530150cc..53561adba 100644 --- a/core/discovery/connectivity.go +++ b/core/discovery/connectivity.go @@ -35,9 +35,11 @@ type serviceStatus struct { lastAvailable time.Time } +const maxUnavailable = 10 * time.Minute + func (s *serviceStatus) Available() (available bool) { s.mu.RLock() - available = !s.lastAvailable.Before(s.lastStateChange) + available = s.lastStateChange.Sub(s.lastAvailable) <= maxUnavailable s.mu.RUnlock() return } @@ -110,12 +112,16 @@ func (d *discovery) updateStatus() error { status.lastStateChange = time.Now() switch state { case connectivity.Idle: + d.Ctx.Infof("%s %s connection idle", id.serviceName, id.id) case connectivity.Connecting: + d.Ctx.Infof("%s %s connecting", id.serviceName, id.id) case connectivity.Ready: - d.Ctx.Infof("%s %s is available", id.serviceName, id.id) + d.Ctx.Infof("%s %s connection ready", id.serviceName, id.id) status.lastAvailable = status.lastStateChange case connectivity.TransientFailure: + d.Ctx.Warnf("%s %s connection failure", id.serviceName, id.id) case connectivity.Shutdown: + d.Ctx.Infof("%s %s connection shutdown", id.serviceName, id.id) } status.mu.Unlock() } else { // context canceled From 9418424d1d8a8b63908181d383e3642fc5ce2306 Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Tue, 13 Aug 2019 14:28:49 +0200 Subject: [PATCH 07/10] Set Gitlab CI variables for Docker --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b4572641..8f2918cde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,6 +68,9 @@ gitlab-image: image: docker:git services: - "docker:dind" + variables: + DOCKER_DRIVER: overlay2 + DOCKER_TLS_CERTDIR: /certs script: - docker build -t ttn . - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" registry.gitlab.com @@ -83,6 +86,9 @@ dockerhub-image: image: docker:git services: - "docker:dind" + variables: + DOCKER_DRIVER: overlay2 + DOCKER_TLS_CERTDIR: /certs script: - docker build -t ttn . - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_PASSWORD" From 66d3beafe07186f35daaa9afab2f8ffd57c1e1c6 Mon Sep 17 00:00:00 2001 From: JP Meijers Date: Mon, 14 Oct 2019 21:11:34 +0200 Subject: [PATCH 08/10] Do not fall back to SF12 when activated using OTAA. Fixes #767 --- core/networkserver/activation.go | 1 + core/networkserver/device/device.go | 5 +++-- core/networkserver/uplink_mac.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/networkserver/activation.go b/core/networkserver/activation.go index d130ed55d..199b094c9 100644 --- a/core/networkserver/activation.go +++ b/core/networkserver/activation.go @@ -134,6 +134,7 @@ func (n *networkServer) HandleActivate(activation *pb_handler.DeviceActivationRe dev.LastSeen = time.Now() dev.UpdatedAt = time.Now() + dev.ActivatedAt = time.Now() dev.DevAddr = *lorawan.DevAddr dev.NwkSKey = *lorawan.NwkSKey dev.FCntUp = 0 diff --git a/core/networkserver/device/device.go b/core/networkserver/device/device.go index bed9c22de..c8d90f229 100644 --- a/core/networkserver/device/device.go +++ b/core/networkserver/device/device.go @@ -36,8 +36,9 @@ type Device struct { Options Options `redis:"options"` ADR ADRSettings `redis:"adr,include"` - CreatedAt time.Time `redis:"created_at"` - UpdatedAt time.Time `redis:"updated_at"` + CreatedAt time.Time `redis:"created_at"` + UpdatedAt time.Time `redis:"updated_at"` + ActivatedAt time.Time `redis:"activated_at"` // Indicates whether the device was activated via OTAA method } // ADRSettings contains the (desired) settings for a device that uses ADR diff --git a/core/networkserver/uplink_mac.go b/core/networkserver/uplink_mac.go index a10457660..4ea4aec06 100644 --- a/core/networkserver/uplink_mac.go +++ b/core/networkserver/uplink_mac.go @@ -97,7 +97,7 @@ func (n *networkServer) handleUplinkMAC(message *pb_broker.DeduplicatedUplinkMes } // We did not receive an ADR response, the device may have the wrong RX2 settings - if dev.ADR.ExpectRes && dev.ADR.Band == "EU_863_870" && viper.GetInt("eu-rx2-dr") != 0 { + if dev.ADR.ExpectRes && dev.ADR.Band == "EU_863_870" && viper.GetInt("eu-rx2-dr") != 0 && dev.ActivatedAt.IsZero() { settings := message.GetResponseTemplate().GetDownlinkOption() if settings.GetGatewayConfiguration().Frequency == 869525000 { if loraSettings := settings.ProtocolConfiguration.GetLoRaWAN(); loraSettings != nil { From 401fa4497ed2931e383e4c2d8530390d228e2792 Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Tue, 15 Oct 2019 07:55:31 +0200 Subject: [PATCH 09/10] Format code --- core/networkserver/device/device.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/networkserver/device/device.go b/core/networkserver/device/device.go index c8d90f229..c2bd0ed73 100644 --- a/core/networkserver/device/device.go +++ b/core/networkserver/device/device.go @@ -36,9 +36,9 @@ type Device struct { Options Options `redis:"options"` ADR ADRSettings `redis:"adr,include"` - CreatedAt time.Time `redis:"created_at"` - UpdatedAt time.Time `redis:"updated_at"` - ActivatedAt time.Time `redis:"activated_at"` // Indicates whether the device was activated via OTAA method + CreatedAt time.Time `redis:"created_at"` + UpdatedAt time.Time `redis:"updated_at"` + ActivatedAt time.Time `redis:"activated_at"` // Indicates whether the device was activated via OTAA method } // ADRSettings contains the (desired) settings for a device that uses ADR From 496d447fa0f32bdbdabd9b0ac87fcdc660f5002c Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Tue, 15 Oct 2019 08:07:39 +0200 Subject: [PATCH 10/10] Update dev/test certificates --- .env/broker/server.cert | 20 +++---- .env/discovery/server.cert | 10 ++-- .env/handler/server.cert | 21 ++++---- .env/mqtt/ca-key.pem | 98 +++++++++++++++++----------------- .env/mqtt/ca.pem | 56 +++++++++---------- .env/mqtt/cert.pem | 46 ++++++++-------- .env/mqtt/key.pem | 50 ++++++++--------- .env/networkserver/server.cert | 10 ++-- .env/router/server.cert | 8 +-- 9 files changed, 160 insertions(+), 159 deletions(-) diff --git a/.env/broker/server.cert b/.env/broker/server.cert index 680837f68..4a37ac67b 100644 --- a/.env/broker/server.cert +++ b/.env/broker/server.cert @@ -1,12 +1,12 @@ -----BEGIN CERTIFICATE----- -MIIB2zCCAYCgAwIBAgIQB23IZZbRR4hwPEKqOw3pTTAKBggqhkjOPQQDAjAyMRsw -GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmsxEzARBgNVBAMTCmRldiBicm9rZXIw -HhcNMTgwOTI3MTA1NjA5WhcNMTkwOTI3MTA1NjA5WjAyMRswGQYDVQQKExJUaGUg -VGhpbmdzIE5ldHdvcmsxEzARBgNVBAMTCmRldiBicm9rZXIwWTATBgcqhkjOPQIB -BggqhkjOPQMBBwNCAARKJiC1vanAuqbOtVYPwSM8D6oSseAOeUra5dHiXtp72d59 -+kgaEfa6Zgp0KSaes+D2fxE+RJ4G6v7DYbKgWOGto3gwdjAOBgNVHQ8BAf8EBAMC -AqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMB -Af8wNAYDVR0RBC0wK4IGYnJva2Vygglsb2NhbGhvc3SHBH8AAAGHEAAAAAAAAAAA -AAAAAAAAAAEwCgYIKoZIzj0EAwIDSQAwRgIhAPhJ2I1f08cua9ZywtsbtadYdVgv -tzdKWtGdmlATCfkcAiEAvgIXD5SO4HgVm+nByFfCI4DSJbjSbON4IuOkDDeSTeg= +MIIB2zCCAYGgAwIBAgIRAIINDE2wsxUUy2NaL3tW024wCgYIKoZIzj0EAwIwMjEb +MBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMRMwEQYDVQQDEwpkZXYgYnJva2Vy +MB4XDTE5MTAxNTA2MDcwM1oXDTIwMTAxNDA2MDcwM1owMjEbMBkGA1UEChMSVGhl +IFRoaW5ncyBOZXR3b3JrMRMwEQYDVQQDEwpkZXYgYnJva2VyMFkwEwYHKoZIzj0C +AQYIKoZIzj0DAQcDQgAESiYgtb2pwLqmzrVWD8EjPA+qErHgDnlK2uXR4l7ae9ne +ffpIGhH2umYKdCkmnrPg9n8RPkSeBur+w2GyoFjhraN4MHYwDgYDVR0PAQH/BAQD +AgKkMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAPBgNVHRMBAf8EBTAD +AQH/MDQGA1UdEQQtMCuCBmJyb2tlcoIJbG9jYWxob3N0hwR/AAABhxAAAAAAAAAA +AAAAAAAAAAABMAoGCCqGSM49BAMCA0gAMEUCIEdSwneQjgUDW1v0R5S6r0dVZmyb +iMRP00kIopnizLHzAiEAiPzTPDRIquNmWdyAFjaA8j3PtmcoXxA6v6OnwJbfI4Y= -----END CERTIFICATE----- diff --git a/.env/discovery/server.cert b/.env/discovery/server.cert index 5a61a0b5e..0401adb50 100644 --- a/.env/discovery/server.cert +++ b/.env/discovery/server.cert @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIIB4zCCAYmgAwIBAgIQeT/AP7jodA2aPfeYbKfiXzAKBggqhkjOPQQDAjA1MRsw +MIIB4jCCAYmgAwIBAgIQPogKbX9UpUPjKEx0GfVL5TAKBggqhkjOPQQDAjA1MRsw GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmsxFjAUBgNVBAMTDWRldiBkaXNjb3Zl -cnkwHhcNMTgwOTI3MTA1NjA4WhcNMTkwOTI3MTA1NjA4WjA1MRswGQYDVQQKExJU +cnkwHhcNMTkxMDE1MDYwNzAzWhcNMjAxMDE0MDYwNzAzWjA1MRswGQYDVQQKExJU aGUgVGhpbmdzIE5ldHdvcmsxFjAUBgNVBAMTDWRldiBkaXNjb3ZlcnkwWTATBgcq hkjOPQIBBggqhkjOPQMBBwNCAAQZ3BU/el/lQZz4hJ2/NAb+oOPNtCJm5dV+WbIS Q+RRIXHKo9G6mDMEhuwrFA4LyikZ1yftNxKoJR7LIJ3wkdR+o3sweTAOBgNVHQ8B Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB /wQFMAMBAf8wNwYDVR0RBDAwLoIJZGlzY292ZXJ5gglsb2NhbGhvc3SHBH8AAAGH -EAAAAAAAAAAAAAAAAAAAAAEwCgYIKoZIzj0EAwIDSAAwRQIhAMVbCPtdKYyzJs/1 -Idt+pqA42Ip/iRT9ptv22jMhd5imAiA1fjIURLDQc/kzSO/3nrSfrVBaGfcJXK1u -lsrRKMoY0w== +EAAAAAAAAAAAAAAAAAAAAAEwCgYIKoZIzj0EAwIDRwAwRAIgQV2nFkOnHJIsWRiA +yVvkYr0KBgfMXAo7kLO9JiUXrSMCIEvF5R/QEpkirdmSGprv88B5UNtGPPmi52zj +7TYPIlT+ -----END CERTIFICATE----- diff --git a/.env/handler/server.cert b/.env/handler/server.cert index e837d59f9..58d15248f 100644 --- a/.env/handler/server.cert +++ b/.env/handler/server.cert @@ -1,12 +1,13 @@ -----BEGIN CERTIFICATE----- -MIIB3DCCAYOgAwIBAgIQZvzP/XEG934mVuYXxIDiDjAKBggqhkjOPQQDAjAzMRsw -GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmsxFDASBgNVBAMTC2RldiBoYW5kbGVy -MB4XDTE4MDkyNzEwNTYwOVoXDTE5MDkyNzEwNTYwOVowMzEbMBkGA1UEChMSVGhl -IFRoaW5ncyBOZXR3b3JrMRQwEgYDVQQDEwtkZXYgaGFuZGxlcjBZMBMGByqGSM49 -AgEGCCqGSM49AwEHA0IABIl21r8mIzjD+Hm02LVb3SLAcEvlN5WlpbUe1aMePpEF -nBiyxIPrLiPUkWciivn64cPSTym1TSIBL/0udGCnzBGjeTB3MA4GA1UdDwEB/wQE -AwICpDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUw -AwEB/zA1BgNVHREELjAsggdoYW5kbGVygglsb2NhbGhvc3SHBH8AAAGHEAAAAAAA -AAAAAAAAAAAAAAEwCgYIKoZIzj0EAwIDRwAwRAIgA8JsGTiUR4S8lBgheN+5NdNC -qJP84AQKLIIS6fPU1/0CIEZ/b7/OkYYiiTwG5wntXx/O7aj+icVrLhSKAYz+vRZo +MIIB3TCCAYSgAwIBAgIRANk/uIeakKj3GyaWsp6VxTswCgYIKoZIzj0EAwIwMzEb +MBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMRQwEgYDVQQDEwtkZXYgaGFuZGxl +cjAeFw0xOTEwMTUwNjA3MDNaFw0yMDEwMTQwNjA3MDNaMDMxGzAZBgNVBAoTElRo +ZSBUaGluZ3MgTmV0d29yazEUMBIGA1UEAxMLZGV2IGhhbmRsZXIwWTATBgcqhkjO +PQIBBggqhkjOPQMBBwNCAASJdta/JiM4w/h5tNi1W90iwHBL5TeVpaW1HtWjHj6R +BZwYssSD6y4j1JFnIor5+uHD0k8ptU0iAS/9LnRgp8wRo3kwdzAOBgNVHQ8BAf8E +BAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQF +MAMBAf8wNQYDVR0RBC4wLIIHaGFuZGxlcoIJbG9jYWxob3N0hwR/AAABhxAAAAAA +AAAAAAAAAAAAAAABMAoGCCqGSM49BAMCA0cAMEQCIGTGcaFc2cwNz1bcQWA5imQL +izEIhm4mmrUN4DQvIDvRAiAK8Mfde4f58kTeUYdJJXi1ZiFEUB5Woc+RJeji+a5/ +7A== -----END CERTIFICATE----- diff --git a/.env/mqtt/ca-key.pem b/.env/mqtt/ca-key.pem index 176bd8529..c9b5e3189 100644 --- a/.env/mqtt/ca-key.pem +++ b/.env/mqtt/ca-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/.env/mqtt/ca.pem b/.env/mqtt/ca.pem index 7c9bf6740..699c67f40 100644 --- a/.env/mqtt/ca.pem +++ b/.env/mqtt/ca.pem @@ -1,30 +1,30 @@ -----BEGIN CERTIFICATE----- -MIIFITCCAwmgAwIBAgIRAPsGNI/6/jsfHYxm4oNPxc8wDQYJKoZIhvcNAQELBQAw -LzEbMBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMRAwDgYDVQQDEwdUZXN0IENB -MB4XDTE4MDkxMDA5NTA1MVoXDTE5MDkxMDA5NTA1MVowLzEbMBkGA1UEChMSVGhl -IFRoaW5ncyBOZXR3b3JrMRAwDgYDVQQDEwdUZXN0IENBMIICIjANBgkqhkiG9w0B -AQEFAAOCAg8AMIICCgKCAgEA5wnYv5E7aTxjeVruC6LIAz37dZikc9chdwurpD1F -rHd4lnhI9flSvfhVi0nPFmhlVM7E2ptfxrvLY9vAPWLAMK0+wwSOSZ2Unc7ONCmh -n8W5wGjXrAjcNFmG0Kz7tXljcigDgzKMOL7UYruEVy99uplNR3bWTbtQAXwsUkmP -vVJ+FFRIlpDHPZhaETrDE/5pvDUV3blbddoPm+f5Lt94/5ykBt488CQawD3vdbzX -YW+/Z1tmCz4CoZpODKziecaXlhHpEV6n61ZBo3zPPzrWF8zrUWWJSrajHkMm695k -9YIWarEVUMnyE8MCzV9KBXqdXeWEjuThB3Kbwh0+pdbsmZwuxPvK+cZewwwifRxm -hPdesMSsUtzc6Fd7BgiLDdHvBt+7E1bb9AfcyUgMfZoqzqO9dmIhymhZ5ZFAv0yV -ef58GiyqYIWYpPnTMazDa5FVgXhvxnxAwRTsvRWMHh/goVZU96px/q60n3wrvKQM -G20bh4tHm2BH9Q9WulFFODDRMihERwbWTj8JI6iv2+WXnaaJnjDmfPa/lZUbxm50 -9PZ70nBusFdRt2/PgF/CWua49XqwTckN0XnInHfTCAaTtZu/n0LRCants9LybptH -f5kuIh7YFEPD5tFrroK1jlMuhBVnbvegtqI+zJxLoK0/T2wKMOanKBM1I4t2Fb5x -iRcCAwEAAaM4MDYwDgYDVR0PAQH/BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUFBwMB -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAJ4SsVCe+fw/t95V -lreLVPfOSQWYSMq0Zh+mbR8rfX4QYMoVvycsbjd0QTAOcymuEtENIbejSdQCIUlu -ktE+mPURD+vWY+H9Lr+gUs7zK0jX93vC7UbsXYZ7TkUIa1tGH8saAuuWKpL+peJh -uxF5xijZPbzta9L9BRPWCB5P9xHXf9v3x4bL+RVzTSowaXhYRZkSe8RUBwbcX5W+ -vsttUYyfPdWBhuYWtTlFXMTV5G74t65i5NBicaRYQyI873LjWjH5JHSMvpwVB8mx -734HZc7ylxGfx7+bj86q7QOJ85e+JcnjLY1vVO2b9JrtMtFDtQpe5uCL+NUATIW6 -VSywT9NhGRRO1aRXabXfj/YylGRS1K9i/UocC4gdVLbGw9IiLhtWx2rta2siepQx -DxPukr57aHDk8Xxh2UKamSp0gsVDJ4JctyH461lsSZhEiX4PXH9aOE8NrmO8dUqn -hR+Y/7OeN+XyHdmf/NVW4enufe/iiNq063hc3Ic8nGsY5Te5KmORr7Z359neogy4 -UwOMn+7T0ML3yeQcClDDYd3R8UT3vLMhfhvXUb1oCS0c7Uj+WN440CpEKXo0Gu65 -nb4uQQVpM14ZHtADejNJHD3j3Fu4oektlsDwKIGfyZDtBF6VFt7CiaVx7s0IkT4J -ryd+/zTMfE9U626KeauS9k6lCCB4 +MIIFIDCCAwigAwIBAgIQcH5kMEdqCbbe6T17a8JlvDANBgkqhkiG9w0BAQsFADAv +MRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmsxEDAOBgNVBAMTB1Rlc3QgQ0Ew +HhcNMTkxMDE1MDYwNzA0WhcNMjAxMDE0MDYwNzA0WjAvMRswGQYDVQQKExJUaGUg +VGhpbmdzIE5ldHdvcmsxEDAOBgNVBAMTB1Rlc3QgQ0EwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQDe2gTj5EDgbqeHDoetEwZgQCGBDDl2aBxVFjqmLh4J +WYNxV7btj/oJKv7Rs4Tdl7YiCFZT8LagyM8BdercLCVFXHXt+JqCCCn7JaicTbjs +kCCEdqj64qtvyACvKkUwh/9J+67imh4Hd/E1svRWKve0FE6JDMCKEQB/qmI1pg1+ +w20oOjYviLyxc++PH/TJh10B3eosHx6jEDCQAV+Q1W5qhDs8RoPy/0sopv4J6LWP +nby0SHl0MJppdT3ClTJ8oIKsRneDl1zJrjR3XxcXQyZaYD320ydtbymAIqxXkmRR +5QNsNc9f7QkUX9wzC5gIQLMGvBPZPFDA06uML0PUJMdFD/0ypQMx2FvzqqZvjqeW +U6EwEUJIpNVTejSBhwKGjymIHnnnZ0F0CWuKDAlJGwcIlnu7gUUvHpnJs8pyQMkg +6Me42BxyqWEARA204jro7H8Gk2QaRMrzJyY8DB235AS/sZicA9rWWn4T7e+jQk5M +5xV7fTAM6H7HWMzOiPWO5MWt2ma+BQ+9JPnCzmshOFokKFzSdmh8mmLpdJcEB71w +71k089RjCXfr5cAxleJd9gZQr5yj+9IU/5XQsl3u9hUbyToH/UR4X4rLBHQV8qnp +ZA9n1NXdCajYgiu6G0M0w/l9kENJ1X5v4T6xMF+uwtx2UPCODwUuTMnMxuvHoYul +VQIDAQABozgwNjAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEw +DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEADbWCODvE8tfZ3sG2 +Q0ih/1c8hrfkTxe9MZQSdGEr6jVsTfqx3J0G7vXfJLkhR3kMvm6zw8RTJBbUcrd1 +QzbDxu0ihndzULjoaI29eRXJUtGRgaYkoYFvl7jbV9niT/tuS+/KF5cKSb/f3jxM +TNp9Sc5K5bARAnzhEy/8L05X40EQo5fbrRvrwGWizbGiHk5sUubeH5A8vcEQ0LeA +7JlTzgb4WcfPVqfEHBykqAjeF9q0XS3DpZI227VsWrqP245XspcUSZm+ryNHe2sH +I5RQkiBVKEid6loZ+9wuVGGgl3FK892snt0/scbjs77pNDgX86XxFfbBc/oSkUG+ +sTUg++uNfOV2KaZaIOE6Gr6K4EEU5hi76Eya8tt4Lqg8b4ft92805L6rT+pdk1X6 +zyrIJFoiA4L3iEPeNceNuMzAQQKx988XASWWPe1eSquy4pVarXP4p0betR664Qjm +PBcX72KojmJXNdqn+hzkS8qtbRH9Zvtxz+MFtcSwB9zOz/HPGlyIrVblM7q+F8iN +GseFDHpbNDHKlMFgnggyZ6silbH4dwTVpiaZf/+8Tqrn2/tN0YJTVfGzEkB83dtx +dwgYx7HAZMeQtmD9WBEqIs7KEi9PpgDg/LmJpNa6T3LgBmlVjidMoQ0FJoOGPFJ1 +Vg2rrzvm5q8BhN9rD7IAMJTlu+4= -----END CERTIFICATE----- diff --git a/.env/mqtt/cert.pem b/.env/mqtt/cert.pem index 428149b86..f8ddb206d 100644 --- a/.env/mqtt/cert.pem +++ b/.env/mqtt/cert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/.env/mqtt/key.pem b/.env/mqtt/key.pem index fb9be2bfa..739fd61de 100644 --- a/.env/mqtt/key.pem +++ b/.env/mqtt/key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEoAIBAAKCAQEA5U1NNa2Su9o3vPa42S7nF3kCPpwihba57umBAsodlNfQvjgq -NMmrDGlL6tOA0zkiFsP1BV5r41zjzS3NAIKPjqn/US/JmlkL2YSrrh53TxM/DMxp -II3hGXq7jLglILF/tzRBQlkpPgVfwtxBM+/AQvPPPfBwh7S+JAj7ODxUX6WeMRXn -3AlTE6JP2VTVSqr/rNQeLQt2LJdHPNers6JXPiIEa19GwTqh9xfZBGXukI7/IKDJ -GOt8nthQMjqygJK37R+hErqHKq2nrm8ABYdoTHP3jzFnvribdOXYleKGbclF0T8t -Kfrm16GUA3ykTEoCIp3elPspmWRDmsGONI7IgQIDAQABAoIBAD9iculXpawP0kCF -4usGMBMo/BnahyB3NkZ4fZUL0cmHLsimNeSJqqKvqLCs7nt025t3Z4+oXiJnVwEs -m/J8JLrG+zCyCQSFgOUL63kiKtDM/SzIhHbfQU4NwzJO5NR4vFkkNLXmd6QRUDtJ -LyzwJTFcu/jfMfwRVk4XvXn6E0istV3lfv8n6kXGW6CzUoVaF8fEB15Z9M9JdhRl -yoAJP/G0HWHjW7I7Tbp+NWfj5Jy6hR+KYTIr0UJhyACK1dupRM4xxUrCsmvOGkOZ -Nq4s/iZ83XAZkOjkBpQkT3pRkRaRDShDBOtea5tyYl5SLCGg5yp4OkfokIGnhFEx -M/+1nAECgYEA6riDgZ/TcbF9OGVF/w/Z4rHcGCSCrm1G6Xk0WhF8zI8P26Lhey1Y -kC5EXXT+8C+ZCB2ruBuhZtWG2pIqY5R6uBxrQdv+kO2wWEGolLavytCSq+6tGQjv -/QFQaR4Ubk5GO8olrd08HIcM3XE7q0dqPv3lFH6wOHJq6OOClgSJ+hECgYEA+hcG -xVte9CAr98Gf49e4c9UZnIZW4YFGOqLbAt5nyfMgMLmO9NFz2Na7Z5PK+oa7RCN3 -SebkLeQuUvFczwc85zwQoJrz2Re7fIHsM7JGD0Z6a/IKFkOIwO3ct+U40jND57Lg -G6tu73tJDr1f22cn4GAjRWwAGPiCrmsy6bRR93ECgYBevc1vA+kgCglGOzKOqoJD -C5GQOSR6bWdjE+Y6uLZMBy7ac5tZ0cren54+rtu8bSny6a8HaDe0v1loXfk4KpWC -PQ5aDgdpzlcQuKfoJvk7/wZE2dkKst3TnLUtSNPsVjHpLkYZMKRzy1s5AtyX3QKY -nHjb1eshTaWzjSmHjht3UQJ/ITbtr0hzU/jx3fXZRmlgFgI3ZJJy94Az05XNgJQJ -NMkVfWMnmVw4BpR+T0NRsfQy6tnK/gWsSGwFuv5TVSug6xUPIEV0HWEJhX+73yHO -LDkwCSYcMNjHUNhGeCX5ZfFpE1yuZv5dvXCiQ1LjaEBLC4G5LX8qhCZ9NK0IFgHc -4QKBgAitQ+Pq8aByk/huqQLGAFKf064IzzRdBMWy4sbhk+ZJQZoYw/2i5jdey+tV -0uTJfdhlSEALLKd8vmrLVfonRKMM47DMx5vONzJwmWfJ0ieyx9V4DDDcBg48iVYw -0qBxzErHJRoGNo+KSXrxwCyGrUbG40faqiZO1OCrR78nve/x +MIIEoQIBAAKCAQEA3VwDNrotEKinDQG5ZvRgSIQyB/4PdkUItpzqJiMW25KcUOOZ +P22l0xM8YR4BB2yR3r2OmVRGzu4qDRDs7gy1OikxRroU5YSodw5XbC5sZ1T6W3uC +KPZraUWQt2dsS+I7kKaM/8wyxPIQcUP0WDuEy5529kD8tQSNp+xKWPanZh7dXuIx +dkhznYfSc8qGKzLLwAeYjqeAEdaaD9RF8Wujo7JJXfJs6tQhjpjRBH/UfBIEGcEo +4PbVHXX1xXZ7bT+sm5kjR2ro16T5IBjTpp4SLKyIuQU1FJDt2T1qDmtRR6eLXWGS +mVJ837sncQujvGImM3V5Fn5EDuLJZCy3EMg2jwIDAQABAoIBAQCQHrEk95ARsYyZ +xk6cvmzVqeQdGgedHBMxOfak/+GI8ep+K8EB7/Sv+W0tWeiXmdNbLxVhtOIpJh0Q +xr1Lu9BeXqVrhAnI6Vb5tMescok3ubcKyt4Sp2WFc7pl/pseyNu5MQbKIHvJiES2 +SeUTcSTjoXeYmvUtMhq8gvZg965DqIyszj6BLYPm711Wklv015t1om/r1LKIk925 +ZcchzpmNvfVFSTkrvIERhZQryl+hHPtxmlesw9CSv8hdAGI1um43c0ZNAJLh+6Q2 +4isZcZpx4djiod/NNyhIlPxbjrqleMyeB5p0dfUY15Snm6E7WIcMnbP/knGdYHZ4 +qUXZZzwBAoGBAPPjIMwMs6YifpRL3+nOq1vRoTy6Mthw0zXE41guZvE5lTT14gMW +6a7XEh2kYqEKJvJqWYb0Px2NPXOMwJOj/O37dGJg1XhBoTV/qs52rXXwKw8hIhu+ +LPHBIGbw9LweWFxBGg/Npm5VxP3U+KGW94t9ZFnaGMD14l1Rp8ti//oBAoGBAOha +dS+7F7od8Y950d1uw8GRPNBLPtdwTjY82Ep6KnsPOjzwVnNo1esctndGRrXNjbX6 +B68hGpVnYoSIXqaik7XlkZ56m8CL2R4IV39iiXJU7DRcNz9tyJWRPr4gqqDrZWHc +2wECo3xk5DuHkM96pKkp3jeUuJajwW65NCHJK5CPAoGAe5RDMiHdhflEmnA37YlD +WytFwDe5O+Mvorc5W51nnCPJbySIeXhKwMVJ8KszLtauFXe+FZv9v0OqN7rCeg1G +RHB98LuQb3cR8MHYEvYfvvsLVoc7eUNMEtQBTygZWpklvNlgE1HpW08qmlQoB/kv +RgcrqjvQ/zWYliCiHXT0sAECgYAkIm03DxGRkDaQ6ZEJrsAiykN64TjUqFKBfNTm +QDl7CdM0xuuq5xLdjYmS4wr8Gwt+0XOAeNV5hqp7kfmmUIJIN3t9+fNe7mDFmuaA +mQJnFW3mdrDg3GHlYMExMENY40LRBVfJwG9MWSRlXZ/XpGsXI7u7SRWr16utXIAP +AQoVYQJ/N4vmLA6GgdoyT+N14Ly8ZkAYLhriGeI5/QyznS4VhZ9Goo9DOwY5IHX9 +/6rJ0U3hWKOZWtWd/QsH8Yj5Qn/B8ff5GUQ6UF/YqC9+i/993wFmev0Of3utUf8n +r5da3vfGF1q2cf6xskg1LxiW/EujloThH4dAOdUqy9WE9FrVyw== -----END RSA PRIVATE KEY----- diff --git a/.env/networkserver/server.cert b/.env/networkserver/server.cert index 30a55ddcb..aa2a93e78 100644 --- a/.env/networkserver/server.cert +++ b/.env/networkserver/server.cert @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIIB6jCCAZCgAwIBAgIRAKjF+axVFtzJcd+IPCoDWocwCgYIKoZIzj0EAwIwNjEb +MIIB6jCCAZCgAwIBAgIRAP+352tk6xCxNNfmUy4TImowCgYIKoZIzj0EAwIwNjEb MBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMRcwFQYDVQQDEw4gbmV0d29ya3Nl -cnZlcjAeFw0xODA5MjcxMDU2MDlaFw0xOTA5MjcxMDU2MDlaMDYxGzAZBgNVBAoT +cnZlcjAeFw0xOTEwMTUwNjA3MDNaFw0yMDEwMTQwNjA3MDNaMDYxGzAZBgNVBAoT ElRoZSBUaGluZ3MgTmV0d29yazEXMBUGA1UEAxMOIG5ldHdvcmtzZXJ2ZXIwWTAT BgcqhkjOPQIBBggqhkjOPQMBBwNCAASx8gNvhVr2hxvAa5zfvkHHDkgJMJdnrSZu B3HclLJabX0Nbl2KHM8WsHQTO76VqT3WtMRqif1Y1xWJuEU0bnAyo38wfTAOBgNV HQ8BAf8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1Ud EwEB/wQFMAMBAf8wOwYDVR0RBDQwMoIJbG9jYWxob3N0gg1uZXR3b3Jrc2VydmVy -hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMAoGCCqGSM49BAMCA0gAMEUCIQDiXQad -tPHppylaBeYx6hWHbsQ5arSoa0eYRC+XwfiUigIgR4K2abz4HOgrp7jU1qHn2s+V -cmlWJe4RNTsBGI3zCZY= +hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMAoGCCqGSM49BAMCA0gAMEUCIQDfm4Wj +0iBey/dxKI6Ev1G5XTEm2ZgVDv49eBDNqQk2aQIgEh3xogWh9wAaGn+pYXlTQLIu +w303Eidv4bn5Zma50zg= -----END CERTIFICATE----- diff --git a/.env/router/server.cert b/.env/router/server.cert index 57e3e94bd..d39351e4d 100644 --- a/.env/router/server.cert +++ b/.env/router/server.cert @@ -1,12 +1,12 @@ -----BEGIN CERTIFICATE----- -MIIB3DCCAYGgAwIBAgIRAI8kwcLmUSPqInw9/FGPfOUwCgYIKoZIzj0EAwIwMjEb +MIIB3DCCAYGgAwIBAgIRALqIfGXLLTvGIEhWsiB+Pc8wCgYIKoZIzj0EAwIwMjEb MBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMRMwEQYDVQQDEwpkZXYgcm91dGVy -MB4XDTE4MDkyNzEwNTYwOFoXDTE5MDkyNzEwNTYwOFowMjEbMBkGA1UEChMSVGhl +MB4XDTE5MTAxNTA2MDcwM1oXDTIwMTAxNDA2MDcwM1owMjEbMBkGA1UEChMSVGhl IFRoaW5ncyBOZXR3b3JrMRMwEQYDVQQDEwpkZXYgcm91dGVyMFkwEwYHKoZIzj0C AQYIKoZIzj0DAQcDQgAEK3G/V26Wz611p/EIfJETcc7fmNwacclYEZHkk99FXKaV wL/NweuKKpJRRU6/QZjkrEl2NYisXA1FftuUxJLgq6N4MHYwDgYDVR0PAQH/BAQD AgKkMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAPBgNVHRMBAf8EBTAD AQH/MDQGA1UdEQQtMCuCCWxvY2FsaG9zdIIGcm91dGVyhwR/AAABhxAAAAAAAAAA -AAAAAAAAAAABMAoGCCqGSM49BAMCA0kAMEYCIQDYyjCLkUQbIRnBKtzleXQJdOur -VefiMujx2U2GQyJAtAIhAJpWnE7/YUf4yWzlD1vOVNn4luLCKnT9d7c6rBiCNb6q +AAAAAAAAAAABMAoGCCqGSM49BAMCA0kAMEYCIQDIfsrMi4D4KI2DTu7PPMiMaqYg +2KrjjVt9N5lBekKtaQIhAKpeTq6tUeHR5stFtfKiGOoei8fQNVrDNJH914GDUWV8 -----END CERTIFICATE-----