minor fix

ABresting · ABresting · commit 2c135eb69715 · 2021-08-16T06:18:23.000+02:00
diff --git a/configs/samples/configuration.yml b/configs/samples/configuration.yml
@@ -30,7 +30,7 @@ riotpot:
 
   #Services which will run at start. For all the services, set `autod` to `true`.
   # enter them separated by space
-  boot: coapd echod
+  boot: httpd echod telnetd mqttd coapd modbusd
   
   # `start` contains a list of services desired to be run
   # on-start.  
@@ -45,7 +45,7 @@ riotpot:
     # - modbus, oitc/modbus-server, 10.5.0.11
 
   # Fill the mode, low, high or hybrid, to be used in containerized mode
-  mode: hybrid
+  mode: low
 
   # Contains a list of available services in the application.
   # This gives the user the ability to navigate or load
diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml
@@ -82,16 +82,4 @@ services:
     volumes:
       - ../test/pkg/services/mqtt:/riotpot/
     networks:
-      honeypot:
-
-  mqtt:
-    image: eclipse-mosquitto
-    networks:
-      honeypot:
-        ipv4_address: 10.5.0.10
-
-  http:
-    image: httpd
-    networks:
-      honeypot:
-        ipv4_address: 10.5.0.12
+      honeypot:
diff --git a/internal/configuration/autopilot.go b/internal/configuration/autopilot.go
@@ -154,9 +154,15 @@ func (a *Autopilot) Start() {
 			fmt.Printf("\nPlugins to run are ")
 			fmt.Println(a.plugins_to_run)
 		} else if a.Settings.Riotpot.Mode == "high" {
+			fmt.Printf("\nContianers to run are ")
+			fmt.Println(a.containers_to_run)
 			a.DeployGlider()
 		} else if a.Settings.Riotpot.Mode == "hybrid" {
 			a.plugins_to_run = a.Settings.Riotpot.Start
+			fmt.Printf("\nPlugins to run are ")
+			fmt.Println(a.plugins_to_run)
+			fmt.Printf("\nContianers to run are ")
+			fmt.Println(a.containers_to_run)
 			a.DeployGlider()
 		}
 
@@ -197,15 +203,15 @@ func (a *Autopilot) available(name string, port int) (available bool) {
 }
 
 func (a *Autopilot) CheckModesFromConfig() {
-	mode_received := a.Settings.Riotpot.Mode
+	mode_received := arrays.StringToArray( a.Settings.Riotpot.Mode)
 
 	if len(mode_received) > 1 {
 		log.Fatalf("\nPlease enter only one mode in Riotpot config mode, i.e. low, high or hybrid\n")
 	} else if len(mode_received) == 0 {
 		log.Fatalf("\nPlease enter atleast one mode in Riotpot config mode, i.e. low, high or hybrid\n")
 	}
 
-	if ! arrays.Contains(a.Settings.Riotpot.Allowed_modes, mode_received) {
+	if ! arrays.Contains(a.Settings.Riotpot.Allowed_modes, mode_received[0]) {
 		log.Fatalf("\n %q mode is invalid, only choose low, high or hybrid mode only in Riotpot config\n", mode_received[0])
 	}
 }
@@ -291,7 +297,7 @@ func (a *Autopilot) DeployGlider() {
 		fmt.Println(a.remote_host_ip)
 		
 		app := environ.GetPath("glider")
-		environ.ExecuteCmd(app, "-verbose", "-listen", listener, "-forward", forwarder, "&")
+		environ.ExecuteBackgroundCmd(app, "-verbose", "-listen", listener, "-forward", forwarder, "&")
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,15 @@ func (a *Autopilot) Start() {`
`154`	`154`	`fmt.Printf("\nPlugins to run are ")`
`155`	`155`	`fmt.Println(a.plugins_to_run)`
`156`	`156`	`} else if a.Settings.Riotpot.Mode == "high" {`
	`157`	`+ fmt.Printf("\nContianers to run are ")`
	`158`	`+ fmt.Println(a.containers_to_run)`
`157`	`159`	`a.DeployGlider()`
`158`	`160`	`} else if a.Settings.Riotpot.Mode == "hybrid" {`
`159`	`161`	`a.plugins_to_run = a.Settings.Riotpot.Start`
	`162`	`+ fmt.Printf("\nPlugins to run are ")`
	`163`	`+ fmt.Println(a.plugins_to_run)`
	`164`	`+ fmt.Printf("\nContianers to run are ")`
	`165`	`+ fmt.Println(a.containers_to_run)`
`160`	`166`	`a.DeployGlider()`
`161`	`167`	`}`
`162`	`168`
`@@ -197,15 +203,15 @@ func (a *Autopilot) available(name string, port int) (available bool) {`
`197`	`203`	`}`
`198`	`204`
`199`	`205`	`func (a *Autopilot) CheckModesFromConfig() {`
`200`		`- mode_received := a.Settings.Riotpot.Mode`
	`206`	`+ mode_received := arrays.StringToArray( a.Settings.Riotpot.Mode)`
`201`	`207`
`202`	`208`	`if len(mode_received) > 1 {`
`203`	`209`	`log.Fatalf("\nPlease enter only one mode in Riotpot config mode, i.e. low, high or hybrid\n")`
`204`	`210`	`} else if len(mode_received) == 0 {`
`205`	`211`	`log.Fatalf("\nPlease enter atleast one mode in Riotpot config mode, i.e. low, high or hybrid\n")`
`206`	`212`	`}`
`207`	`213`
`208`		`- if ! arrays.Contains(a.Settings.Riotpot.Allowed_modes, mode_received) {`
	`214`	`+ if ! arrays.Contains(a.Settings.Riotpot.Allowed_modes, mode_received[0]) {`
`209`	`215`	`log.Fatalf("\n %q mode is invalid, only choose low, high or hybrid mode only in Riotpot config\n", mode_received[0])`
`210`	`216`	`}`
`211`	`217`	`}`
`@@ -291,7 +297,7 @@ func (a *Autopilot) DeployGlider() {`
`291`	`297`	`fmt.Println(a.remote_host_ip)`
`292`	`298`
`293`	`299`	`app := environ.GetPath("glider")`
`294`		`- environ.ExecuteCmd(app, "-verbose", "-listen", listener, "-forward", forwarder, "&")`
	`300`	`+ environ.ExecuteBackgroundCmd(app, "-verbose", "-listen", listener, "-forward", forwarder, "&")`
`295`	`301`	`}`
`296`	`302`	`}`
`297`	`303`