Update Config.go

machinery/data/config/config.json

@@ -1,25 +1,20 @@
+
 {
 	"type": "",
-	"key": "okkey",
-	"name": "rtsp2",
+	"key": "",
+	"name": "agent",
 	"time": "false",
 	"offline": "false",
-	"auto_clean": "100",
+	"auto_clean": "true",
 	"remove_after_upload": "true",
-	"max_directory_size": 20,
-	"timezone": "Europe/Brussels",
+	"max_directory_size": 100,
+	"timezone": "Africa/Ceuta",
 	"capture": {
 		"name": "",
 		"ipcamera": {
-			"width": 640,
-			"height": 480,
-			"fps": "",
-			"rtsp": "rtsp://fake.kerberos.io/stream",
-			"sub_rtsp": "rtsp://kellyvd:cedricve123@192.168.1.68:554/Streaming/Channels/102?transportmode=multicast\u0026profile=Profile_1",
-			"onvif": "true",
-			"onvif_xaddr": "192.168.1.68",
-			"onvif_username": "kellyvd",
-			"onvif_password": "cedricve123"
+			"rtsp": "",
+			"sub_rtsp": "",
+			"fps": ""
 		},
 		"usbcamera": {
 			"device": ""
@@ -27,27 +22,27 @@
 		"raspicamera": {
 			"device": ""
 		},
+		"continuous": "false",
 		"recording": "true",
 		"snapshots": "true",
-		"motion": "true",
 		"liveview": "true",
-		"continuous": "false",
-		"postrecording": 5,
-		"prerecording": 5,
-		"maxlengthrecording": 10,
+		"motion": "true",
+		"postrecording": 20,
+		"prerecording": 10,
+		"maxlengthrecording": 30,
 		"transcodingwebrtc": "",
 		"transcodingresolution": 0,
 		"forwardwebrtc": "",
 		"fragmented": "false",
-		"fragmentedduration": 10,
+		"fragmentedduration": 8,
 		"pixelChangeThreshold": 150
 	},
 	"timetable": [
 		{
 			"start1": 0,
-			"end1": 0,
-			"start2": 0,
-			"end2": 0
+			"end1": 43199,
+			"start2": 43200,
+			"end2": 86400
 		},
 		{
 			"start1": 0,
@@ -94,106 +89,15 @@
 			"x2": 800,
 			"y2": 640
 		},
-		"polygon": [
-			{
-				"id": "1694456798869",
-				"coordinates": [
-					{
-						"x": 458.8176559163439,
-						"y": 420.6597577161105
-					},
-					{
-						"x": 541.8959724597637,
-						"y": 422.62130444776193
-					},
-					{
-						"x": 540.2578560606811,
-						"y": 446.03551153214977
-					},
-					{
-						"x": 459.51092569845395,
-						"y": 445.07041692205803
-					}
-				]
-			},
-			{
-				"id": "1694455955284",
-				"coordinates": [
-					{
-						"x": 82.63849814838939,
-						"y": 122.83665165528404
-					},
-					{
-						"x": 259.18591194149286,
-						"y": 122.83665165528404
-					},
-					{
-						"x": 259.18591194149286,
-						"y": 232.42716889666335
-					},
-					{
-						"x": 82.63849814838939,
-						"y": 232.42716889666335
-					}
-				]
-			},
-			{
-				"id": "1694455953115",
-				"coordinates": [
-					{
-						"x": 200.7130606007035,
-						"y": 171.25495957161723
-					},
-					{
-						"x": 445.73676749725524,
-						"y": 171.25495957161723
-					},
-					{
-						"x": 445.73676749725524,
-						"y": 297.5911664681689
-					},
-					{
-						"x": 200.7130606007035,
-						"y": 297.5911664681689
-					}
-				]
-			},
-			{
-				"id": "0",
-				"coordinates": [
-					{
-						"x": 351.8431271737717,
-						"y": 65.62379883848743
-					},
-					{
-						"x": 609.6534108617149,
-						"y": 65.62379883848743
-					},
-					{
-						"x": 609.6534108617149,
-						"y": 246.50145841295546
-					},
-					{
-						"x": 351.8431271737717,
-						"y": 246.50145841295546
-					}
-				]
-			}
-		]
+		"polygon": []
 	},
 	"cloud": "s3",
 	"s3": {
 		"proxyuri": "http://proxy.kerberos.io",
 		"bucket": "kerberosaccept",
-		"region": "eu-west1",
-		"username": "cedricve"
-	},
-	"kstorage": {
-		"uri": "https://api.vault.kerberos.io",
-		"access_key": "pDCQve0XL1DXwy2x",
-		"secret_access_key": "GTpus90EKrKYuplqL3g!2oiQ@s",
-		"directory": "cedricve"
+		"region": "eu-west-1"
 	},
+	"kstorage": {},
 	"dropbox": {},
 	"mqtturi": "tcp://mqtt.kerberos.io:1883",
 	"mqtt_username": "",
@@ -203,9 +107,9 @@
 	"turn_username": "username1",
 	"turn_password": "password1",
 	"heartbeaturi": "",
-	"hub_uri": "http://localhost:8081",
-	"hub_key": "AKIA5V6EGLUWXDU4JBEI",
-	"hub_private_key": "DIOXToTpAlYpa4atf7aWtxHd9xEw/Fk4XioL0tek",
+	"hub_uri": "https://api.cloud.kerberos.io",
+	"hub_key": "",
+	"hub_private_key": "",
 	"hub_site": "",
 	"condition_uri": ""
-}
+}

machinery/src/models/Config.go

@@ -21,7 +21,7 @@ type Config struct {
 	AutoClean         string       `json:"auto_clean"`
 	RemoveAfterUpload string       `json:"remove_after_upload"`
 	MaxDirectorySize  int64        `json:"max_directory_size"`
-	Timezone          string       `json:"timezone,omitempty" bson:"timezone,omitempty"`
+	Timezone          string       `json:"timezone"`
 	Capture           Capture      `json:"capture"`
 	Timetable         []*Timetable `json:"timetable"`
 	Region            *Region      `json:"region"`
@@ -76,9 +76,9 @@ type IPCamera struct {
 	RTSP          string `json:"rtsp"`
 	SubRTSP       string `json:"sub_rtsp"`
 	ONVIF         string `json:"onvif,omitempty" bson:"onvif"`
-	ONVIFXAddr    string `json:"onvif_xaddr,omitempty" bson:"onvif_xaddr"`
-	ONVIFUsername string `json:"onvif_username,omitempty" bson:"onvif_username"`
-	ONVIFPassword string `json:"onvif_password,omitempty" bson:"onvif_password"`
+	ONVIFXAddr    string `json:"onvif_xaddr" bson:"onvif_xaddr"`
+	ONVIFUsername string `json:"onvif_username" bson:"onvif_username"`
+	ONVIFPassword string `json:"onvif_password" bson:"onvif_password"`
 }
 
 // USBCamera configuration, such as the device path (/dev/video*)