Explicit arch var for cloud release make command

Thanks @inverse !

Co-authored-by: Malachi Soord <[email protected]>

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gomod" 
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/go.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
         go-version: ^1.15
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
     - name: Build
       run: make build
     - name: Test

.gitignore

@@ -21,6 +21,3 @@ main
 # Build
 
 /bin
-
-# Logs from executed scripts
-/scripts/output.log

Makefile

@@ -13,13 +13,7 @@ build-prod:
 	GOOS=linux GOARCH=arm RELEASE=prod make build
 
 build-cloud:
-	GOOS=linux GOARCH=amd64 RELEASE=cloud make build
+	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 RELEASE=cloud make build
-
-build-arm64:
-	GOOS=linux GOARCH=arm64 RELEASE=prod make build
-
-build-armhf:
-	GOOS=linux GOARCH=arm RELEASE=prod make build
 
 build:
 	@echo "Building ${GOOS}-${GOARCH}"
@@ -39,28 +33,3 @@ test:
 
 test-with-coverage:
 	go test -tags=unit -timeout=600s -v ./... -coverprofile=coverage.out
-
-install:
-	sudo systemctl stop edgeboxctl
-	sudo rm -rf /usr/local/bin/edgeboxctl /usr/local/sbin/edgeboctl /lib/systemd/system/edgeboxctl.service
-	sudo cp ./bin/edgeboxctl /usr/local/bin/edgeboxctl
-	sudo cp ./bin/edgeboxctl /usr/local/sbin/edgeboxctl
-	sudo cp ./edgeboxctl.service /lib/systemd/system/edgeboxctl.service
-	sudo systemctl daemon-reload
-	@echo "Edgeboxctl installed successfully"
-	@echo "To start edgeboxctl run: systemctl start edgeboxctl"
-
-install-prod: build-prod install
-install-cloud: build-cloud install
-install-arm64: build-arm64 install
-install-armhf: build-armhf install
-
-start:
-	systemctl start edgeboxctl
-
-stop:
-	systemctl stop edgeboxctl
-
-log: start
-	journalctl -fu edgeboxctl
-

README.md

@@ -1,3 +1,21 @@
+
+<!-- PROJECT SHIELDS -->
+<!--
+*** Using markdown "reference style" links for readability.
+*** Reference links are enclosed in brackets [ ] instead of parentheses ( ).
+*** See the bottom of this document for the declaration of the reference variables
+*** for contributors-url, forks-url, etc. This is an optional, concise syntax you may use.
+*** https://www.markdownguide.org/basic-syntax/#reference-style-links
+-->
+[![Contributors][contributors-shield]][contributors-url]
+[![Forks][forks-shield]][forks-url]
+[![Stargazers][stars-shield]][stars-url]
+[![Issues][issues-shield]][issues-url]
+[![MIT License][license-shield]][license-url]
+[![LinkedIn][linkedin-shield]][linkedin-url]
+
+
+
 <!-- PROJECT LOGO -->
 <br />
 <p align="center">
@@ -10,6 +28,8 @@
   <p align="center">
     A System Control module written in Go. Its resonsability is to configure dependencies and perform system tasks, automatically in a schedule, or by command.
     <br />
+    <a href="https://github.com/github_username/edgeboxctl"><strong>Explore the docs »</strong></a>
+    <br />
     <br />
     <a href="https://github.com/github_username/edgeboxctl/issues">Report Bug</a>
     ·
@@ -40,7 +60,7 @@
 
 [![Edgebox Screen Shot][product-screenshot]](https://edgebox.co)
 
-Edgebox is an easy to configure and use system. It brings powerful features that go alongside or can even completely replace various services that you already use in the day-to-day.
+Edgebox is a small box that connects alongside your home internet router. It brings powerful features that go alongside or can even completely replace various services that you already use in the day-to-day.
 
 
 ### Built With
@@ -122,3 +142,19 @@ Contributions are what make the open source community such an amazing place to b
 ## License
 
 Distributed under the MIT License. See `LICENSE` for more information.
+
+
+<!-- MARKDOWN LINKS & IMAGES -->
+<!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
+[contributors-shield]: https://img.shields.io/github/contributors/edgebox-iot/edgeboxctl.svg?style=flat-square
+[contributors-url]: https://github.com/edgebox-iot/edgeboxctl/graphs/contributors
+[forks-shield]: https://img.shields.io/github/forks/edgebox-iot/edgeboxctl.svg?style=flat-square
+[forks-url]: https://github.com/edgebox-iot/edgeboxctl/network/members
+[stars-shield]: https://img.shields.io/github/stars/edgebox-iot/edgeboxctl.svg?style=flat-square
+[stars-url]: https://github.com/edgebox-iot/edgeboxctl/stargazers
+[issues-shield]: https://img.shields.io/github/issues/edgebox-iot/edgeboxctl.svg?style=flat-square
+[issues-url]: https://github.com/edgebox-iot/edgeboxctl/issues
+[license-shield]: https://img.shields.io/github/license/edgebox-iot/edgeboxctl.svg?style=flat-square
+[license-url]: https://github.com/edgebox-iot/edgeboxctl/blob/master/LICENSE.txt
+[linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555
+[linkedin-url]: https://linkedin.com/in/edgebox-iot

cmd/edgeboxctl/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"log"
 	"os"
@@ -12,32 +11,304 @@ import (
 	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/tasks"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
+	"github.com/mitchellh/colorstring"
+	"github.com/urfave/cli/v2" // imports as package "cli",
 )
 
 const defaultNotReadySleepTime time.Duration = time.Second * 60
 const defaultSleepTime time.Duration = time.Second
 
+var errorMissingApplicationSlug = colorstring.Color("[red]Error: [white]Missing application slug")
+var errorSystemNotReady = colorstring.Color("[red]Eror: [white]The system is not ready to run. \n[white]Please run 'cd /home/system/components/ws/ && ./ws -b' first.")
+var errorNotYetImplemented = colorstring.Color("[yellow]This feature is not yet implemented, this command is only a stub.")
+
 func main() {
 
-	// load command line arguments
+	app := &cli.App{
+		Name:  "edgeboxctl",
+		Usage: "A tool to facilitate hosting apps and securing your personal data",
+		Action: func(c *cli.Context) error {
+			startService() // Defaults to start as a service if no commands or flags are passed
+			return nil
+		},
+		Commands: []*cli.Command{
+			{
+				Name:    "bootstrap",
+				Aliases: []string{"b"},
+				Usage:   "Sets up initial structure and dependencies for the edgebox system",
+				Action: func(c *cli.Context) error {
+					return cli.Exit(errorNotYetImplemented, 1)
+				},
+			},
+			{
+				Name:    "tunnel",
+				Aliases: []string{"t"},
+				Usage:   "Edgebox tunnel settings",
+				Subcommands: []*cli.Command{
+					{
+						Name:    "setup",
+						Aliases: []string{"s"},
+						Usage:   "Sets up an encrypted secure connection to a tunnel",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
 
-	version := flag.Bool("version", false, "Get the version info")
+							argumentError := checkArgumentsPresence(c, 4)
-	db := flag.Bool("database", false, "Get database connection info")
+							if argumentError != nil {
-	name := flag.String("name", "edgebox", "Name for the service")
+								return argumentError
-
-	flag.Parse()
-
-	if *version {
-		printVersion()
-		os.Exit(0)
 							}
 
-	if *db {
+							task := getCommandTask(
-		printDbDetails()
+								"setup_tunnel",
-		os.Exit(0)
+								fmt.Sprintf(
+									"{\"bootnode_address\": \"%s\", \"token\": \"%s\", \"assigned_address\": \"%s\", \"node_name\": \"%s\"}",
+									c.Args().Get(0),
+									c.Args().Get(1),
+									c.Args().Get(2),
+									c.Args().Get(3),
+								),
+								true,
+							)
+
+							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+						},
+					},
+					{
+						Name:    "enable",
+						Aliases: []string{"e"},
+						Usage:   "enables the public tunnel (when configured)",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+							return cli.Exit(errorNotYetImplemented, 1)
+						},
+					},
+					{
+						Name:    "disable",
+						Aliases: []string{"d"},
+						Usage:   "disables the public tunnel (when online)",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+							return cli.Exit(errorNotYetImplemented, 1)
+						},
+					},
+				},
+			},
+			{
+				Name:    "app",
+				Aliases: []string{"a"},
+				Usage:   "options for edgeapp management",
+				Subcommands: []*cli.Command{
+					{
+						Name:    "list",
+						Aliases: []string{"l"},
+						Usage:   "list currently installed apps and their status",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+							task := getCommandTask("list_edgeapps", "", true)
+							// return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+							return cli.Exit(task.Result.String, 0)
+						},
+					},
+					{
+						Name:    "install",
+						Aliases: []string{"i"},
+						Usage:   "install the specified app (slug or package file)",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+
+							argumentError := checkArgumentsPresence(c, 1)
+							if argumentError != nil {
+								return argumentError
 							}
 
-	log.Printf("Starting edgeboxctl service for %s", *name)
+							task := getCommandTask("install_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
+
+							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+						},
+					},
+					{
+						Name:    "remove",
+						Aliases: []string{"r"},
+						Usage:   "remove the specified app",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+
+							argumentError := checkArgumentsPresence(c, 1)
+							if argumentError != nil {
+								return argumentError
+							}
+
+							task := getCommandTask("remove_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
+
+							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+						},
+					},
+					{
+						Name:    "start",
+						Aliases: []string{"s"},
+						Usage:   "start the specified app",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+
+							argumentError := checkArgumentsPresence(c, 1)
+							if argumentError != nil {
+								return argumentError
+							}
+
+							task := getCommandTask("start_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
+
+							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+						},
+					},
+					{
+						Name:    "stop",
+						Aliases: []string{"k"},
+						Usage:   "stop the specified app",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+
+							argumentError := checkArgumentsPresence(c, 1)
+							if argumentError != nil {
+								return argumentError
+							}
+
+							task := getCommandTask("stop_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
+
+							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+						},
+					},
+					{
+						Name:    "online",
+						Aliases: []string{"o"},
+						Usage:   "set an app status for online access",
+						Subcommands: []*cli.Command{
+							{
+								Name:    "enable",
+								Aliases: []string{"e"},
+								Usage:   "set an app as accessible online",
+								Before:  canRunCommands,
+								Action: func(c *cli.Context) error {
+
+									argumentError := checkArgumentsPresence(c, 2)
+									if argumentError != nil {
+										return argumentError
+									}
+
+									task := getCommandTask(
+										"enable_online",
+										fmt.Sprintf(
+											"{\"id\": \"%s\", \"internet_url\": \"%s\"}",
+											c.Args().Get(0),
+											c.Args().Get(1),
+										),
+										true,
+									)
+
+									return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+								},
+							},
+							{
+								Name:    "disable",
+								Aliases: []string{"d"},
+								Usage:   "set an app as local-network private",
+								Before:  canRunCommands,
+								Action: func(c *cli.Context) error {
+
+									argumentError := checkArgumentsPresence(c, 1)
+									if argumentError != nil {
+										return argumentError
+									}
+
+									task := getCommandTask("disable_online", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
+
+									return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+								},
+							},
+						},
+					},
+				},
+			},
+			{
+				Name:    "dashboard",
+				Aliases: []string{"d"},
+				Usage:   "set dashboard access",
+				Subcommands: []*cli.Command{
+					{
+						Name:    "enable",
+						Aliases: []string{"e"},
+						Usage:   "enable dashboard access",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+							argumentError := checkArgumentsPresence(c, 1)
+							if argumentError != nil {
+								return argumentError
+							}
+
+							task := getCommandTask("enable_public_dashboard", fmt.Sprintf("{\"internet_url\": \"%s\"}", c.Args().First()), true)
+							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+						},
+					},
+					{
+						Name:    "disable",
+						Aliases: []string{"d"},
+						Usage:   "disable dashboard access",
+						Before:  canRunCommands,
+						Action: func(c *cli.Context) error {
+
+							argumentError := checkArgumentsPresence(c, 1)
+							if argumentError != nil {
+								return argumentError
+							}
+
+							task := getCommandTask("disable_public_dashboard", "", true)
+							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+
+						},
+					},
+				},
+			},
+		},
+	}
+
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func canRunCommands(c *cli.Context) error {
+	if !utils.IsSystemReady() {
+		return cli.Exit(errorSystemNotReady, 1)
+	}
+
+	return nil
+}
+
+func checkArgumentsPresence(c *cli.Context, count int) error {
+	if count != 0 {
+		for i := 0; i < count; i++ {
+			if c.Args().Get(i) == "" {
+				return cli.Exit(errorMissingApplicationSlug, 1)
+			}
+		}
+	}
+	return nil
+}
+
+func getCommandTask(taskSlug string, taskArgs string, execute bool) tasks.Task {
+	task := tasks.GetBaseTask(
+		taskSlug,
+		taskArgs,
+	)
+
+	if execute {
+		task = tasks.ExecuteTask(task)
+	}
+
+	return task
+}
+
+func startService() {
+	log.Printf("Starting edgeboxctl service")
 
 	// setup signal catching
 	sigs := make(chan os.Signal, 1)
@@ -57,7 +328,6 @@ func main() {
 	}()
 
 	printVersion()
-
 	printDbDetails()
 
 	tick := 0
@@ -65,9 +335,9 @@ func main() {
 	// infinite loop
 	for {
 
-		if isSystemReady() {
+		if utils.IsSystemReady() {
 			tick++ // Tick is an int, so eventually will "go out of ticks?" Maybe we want to reset the ticks every once in a while, to avoid working with big numbers...
-			systemIterator(name, tick)
+			systemIterator(tick)
 		} else {
 			// Wait about 60 seconds before trying again.
 			log.Printf("System not ready. Next try will be executed in 60 seconds")
@@ -75,7 +345,6 @@ func main() {
 		}
 
 	}
-
 }
 
 // AppCleanup : cleanup app state before exit
@@ -97,18 +366,7 @@ func printDbDetails() {
 	)
 }
 
-// IsSystemReady : Checks hability of the service to execute commands (Only after "edgebox --build" is ran at least once via SSH, or if built for distribution)
+func systemIterator(tick int) {
-func isSystemReady() bool {
-	_, err := os.Stat(utils.GetPath(utils.WsPath) + ".ready")
-	return !os.IsNotExist(err)
-}
-
-// IsDatabaseReady : Checks is it can successfully connect to the task queue db
-func isDatabaseReady() bool {
-	return false
-}
-
-func systemIterator(name *string, tick int) {
 
 	log.Printf("Tick is %d", tick)
 
@@ -125,7 +383,7 @@ func systemIterator(name *string, tick int) {
 		log.Printf("No tasks to execute.")
 	}
 
-	// Wait about 1 second before resumming operations.
+	// Wait about 1 second before resuming operations.
 	log.Printf("Next instruction will be executed 1 second")
 	time.Sleep(defaultSleepTime)
 

edgeboxctl.service

@@ -1,29 +0,0 @@
-[Unit]
-Description=Edgebox Control Module Service
-ConditionPathExists=/home/system/
-After=network.target
- 
-[Service]
-Type=simple
-User=root
-Group=root
-LimitNOFILE=1024
-
-Restart=on-failure
-RestartSec=10
-startLimitIntervalSec=60
-
-WorkingDirectory=/home/system/components/edgeboxctl
-ExecStart=edgeboxctl --name=edgebox-cloud
-
-# make sure log directory exists and owned by syslog
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/log/edgeboxctl
-ExecStartPre=/bin/chown root:root /var/log/edgeboxctl
-ExecStartPre=/bin/chmod 755 /var/log/edgeboxctl
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=edgeboxctl
- 
-[Install]
-WantedBy=multi-user.target

go.mod

@@ -4,14 +4,19 @@ go 1.15
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
+	github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 // indirect
 	github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/fatih/color v1.13.0 // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/joho/godotenv v1.3.0
+	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-sqlite3 v1.14.7 // indirect
+	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/shirou/gopsutil v3.21.4+incompatible // indirect
 	github.com/tklauser/go-sysconf v0.3.6 // indirect
-	golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549 // indirect
+	github.com/urfave/cli/v2 v2.3.0 // indirect
+	golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -1,12 +1,18 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY=
 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 h1:ZBbLwSJqkHBuFDA6DUhhse0IGJ7T5bemHyNILUjvOq4=
+github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2/go.mod h1:VSw57q4QFiWDbRnjdX8Cb3Ow0SFncRw+bA/ofY6Q83w=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2 h1:5EPE4Uk7ucthLTJAZqZxu6LZluox5/AqXUxJDpzgJjg=
 github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2/go.mod h1:NDZpkezJ8QqyIW/510MywB5T2KdC8v/0oTlEoPcMsRM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
@@ -18,13 +24,25 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
 github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
+github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shirou/gopsutil v3.21.4+incompatible h1:fuHcTm5mX+wzo542cmYcV9RTGQLbnHLI5SyQ5ryTVck=
 github.com/shirou/gopsutil v3.21.4+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -32,6 +50,8 @@ github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/
 github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
 github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA=
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
+github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
@@ -54,9 +74,15 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549 h1:OL5GcZ2XPkte3dpfuFQ9o884vrE3BZQhajdntNMruv4=
 golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a h1:ppl5mZgokTT8uPkmYOyEUmPTr3ypaKkg5eFOGrAmxxE=
+golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -67,6 +93,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

internal/backups/backups.go

@@ -1,28 +0,0 @@
-package backups
-
-// import (
-// 	"fmt"
-// 	"os"
-// 	"path/filepath"
-// 	"strings"
-
-// 	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
-// 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
-// 	"github.com/shirou/gopsutil/disk"
-// )
-
-// Repository : Struct representing the backup repository of a device in the system
-type Repository struct {
-	ID         string 			`json:"id"`
-	FileCount  int64            `json:"file_count"`
-	Size       string           `json:"size"`
-	Snapshots  []Snapshot      	`json:"snapshots"`
-	Status     string     		`json:"status"`
-	// UsageStat  UsageStat        `json:"usage_stat"`
-}
-
-// Snapshot : Struct representing a single snapshot in the backup repository
-type Snapshot struct {
-	ID         string 			`json:"id"`
-	time 	   string           `json:"time"`
-}

internal/edgeapps/edgeapps.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/joho/godotenv"
 
-	"github.com/edgebox-iot/edgeboxctl/internal/system"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 )
 
@@ -23,8 +22,6 @@ type EdgeApp struct {
 	InternetAccessible bool             `json:"internet_accessible"`
 	NetworkURL         string           `json:"network_url"`
 	InternetURL        string           `json:"internet_url"`
-	Options			   []EdgeAppOption  `json:"options"`
-	NeedsConfig		   bool             `json:"needs_config"`
 }
 
 // MaybeEdgeApp : Boolean flag for validation of edgeapp existance
@@ -45,20 +42,8 @@ type EdgeAppService struct {
 	IsRunning bool   `json:"is_running"`
 }
 
-type EdgeAppOption struct {
-	Key             string `json:"key"`
-	Value           string `json:"value"`
-	DefaultValue    string `json:"default_value"`
-	Format          string `json:"format"`
-	Description     string `json:"description"`
-	IsSecret        bool   `json:"is_secret"`
-	IsInstallLocked bool   `json:"is_install_locked"`
-}
-
 const configFilename = "/edgebox-compose.yml"
 const envFilename = "/edgebox.env"
-const optionsTemplateFilename = "/edgeapp.template.env"
-const optionsEnvFilename = "/edgeapp.env"
 const runnableFilename = "/.run"
 const myEdgeAppServiceEnvFilename = "/myedgeapp.env"
 const defaultContainerOperationSleepTime time.Duration = time.Second * 10
@@ -71,15 +56,14 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 		Valid:   false,
 	}
 
-	_, err := os.Stat(utils.GetPath(utils.EdgeAppsPath) + ID + configFilename)
+	_, err := os.Stat(utils.GetPath("edgeAppsPath") + ID + configFilename)
 	if !os.IsNotExist(err) {
 		// File exists. Start digging!
 
 		edgeAppName := ID
 		edgeAppDescription := ""
-		edgeAppOptions := []EdgeAppOption{}
 
-		edgeAppEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + envFilename)
+		edgeAppEnv, err := godotenv.Read(utils.GetPath("edgeAppsPath") + ID + envFilename)
 
 		if err != nil {
 			log.Println("Error loading .env file for edgeapp " + edgeAppName)
@@ -92,109 +76,13 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 			}
 		}
 
-		needsConfig := false
-		hasFilledOptions := false
-		edgeAppOptionsTemplate, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + optionsTemplateFilename)
-		if err != nil {
-			log.Println("Error loading options template file for edgeapp " + edgeAppName)
-		} else {
-			// Try to read the edgeAppOptionsEnv file
-			edgeAppOptionsEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + optionsEnvFilename)
-			if err != nil {
-				log.Println("Error loading options env file for edgeapp " + edgeAppName)
-			} else {
-				hasFilledOptions = true
-			}
-
-			for key, value := range edgeAppOptionsTemplate {
-				
-				optionFilledValue := ""
-				if hasFilledOptions {
-					// Check if key exists in edgeAppOptionsEnv
-					optionFilledValue = edgeAppOptionsEnv[key]
-				}
-
-				format := ""
-				defaultValue := ""
-				description := ""
-				installLocked := false
-
-				// Parse value to separate by | and get the format, installLocked, description and default value
-				// Format is the first element
-				// InstallLocked is the second element
-				// Description is the third element
-				// Default value is the fourth element
-
-				valueSlices := strings.Split(value, "|")
-				if len(valueSlices) > 0 {
-					format = valueSlices[0]
-				}
-				if len(valueSlices) > 1 {
-					installLocked = valueSlices[1] == "true"
-				}
-				if len(valueSlices) > 2 {
-					description = valueSlices[2]
-				}
-				if len(valueSlices) > 3 {
-					defaultValue = valueSlices[3]
-				}
-
-				// // If value contains ">|", then get everything that is to the right of it as the description
-				// // and get everything between "<>" as the format
-				// if strings.Contains(value, ">|") {
-				// 	description = strings.Split(value, ">|")[1]
-				// 	// Check if description has default value. That would be everything that is to the right of the last "|"
-				// 	if strings.Contains(description, "|") {
-				// 		defaultValue = strings.Split(description, "|")[1]
-				// 		description = strings.Split(description, "|")[0]
-				// 	}
-
-				// 	value = strings.Split(value, ">|")[0]
-				// 	// Remove the initial < from value
-				// 	value = strings.TrimPrefix(value, "<")
-				// } else {
-				// 	// Trim initial < and final > from value
-				// 	value = strings.TrimPrefix(value, "<")
-				// 	value = strings.TrimSuffix(value, ">")
-				// }
-
-				isSecret := false
-
-				// Check if the lowercased key string contains the letters "pass", "secret", "key"
-				lowercaseKey := strings.ToLower(key)
-				// check if lowercaseInput contains "pass", "key", or "secret", or "token"
-				if strings.Contains(lowercaseKey, "pass") ||
-					strings.Contains(lowercaseKey, "key") ||
-					strings.Contains(lowercaseKey, "secret") ||
-					strings.Contains(lowercaseKey, "token") {
-					isSecret = true
-				}
-
-				currentOption := EdgeAppOption{
-					Key:             key,
-					Value:           optionFilledValue,
-					DefaultValue:    defaultValue,
-					Description:     description,
-					Format:          format,
-					IsSecret:        isSecret,
-					IsInstallLocked: installLocked,
-				}
-				edgeAppOptions = append(edgeAppOptions, currentOption)
-
-				if optionFilledValue == "" {
-					needsConfig = true
-				}
-
-			}
-		}
-
-
 		edgeAppInternetAccessible := false
 		edgeAppInternetURL := ""
 
-		myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + myEdgeAppServiceEnvFilename)
+		myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath("edgeAppsPath") + ID + myEdgeAppServiceEnvFilename)
 		if err != nil {
-			log.Println("No myedge.app environment file found. Status is Network-Only")
+			// log.Println("No myedge.app environment file found. Status is Network-Only")
+			// File probably not found!
 		} else {
 			if myEdgeAppServiceEnv["INTERNET_URL"] != "" {
 				edgeAppInternetAccessible = true
@@ -210,10 +98,8 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 				Status:             GetEdgeAppStatus(ID),
 				Services:           GetEdgeAppServices(ID),
 				InternetAccessible: edgeAppInternetAccessible,
-				NetworkURL:         ID + "." + system.GetHostname() + ".local",
+				NetworkURL:         ID + ".edgebox.local",
 				InternetURL:        edgeAppInternetURL,
-				Options: 		    edgeAppOptions,
-				NeedsConfig:        needsConfig,
 			},
 			Valid: true,
 		}
@@ -228,7 +114,7 @@ func IsEdgeAppInstalled(ID string) bool {
 
 	result := false
 
-	_, err := os.Stat(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
+	_, err := os.Stat(utils.GetPath("edgeAppsPath") + ID + runnableFilename)
 	if !os.IsNotExist(err) {
 		result = true
 	}
@@ -240,12 +126,11 @@ func IsEdgeAppInstalled(ID string) bool {
 func SetEdgeAppInstalled(ID string) bool {
 
 	result := true
-	edgeAppPath := utils.GetPath(utils.EdgeAppsPath)
 
-	_, err := os.Stat(edgeAppPath + ID + runnableFilename)
+	_, err := os.Stat(utils.GetPath("edgeAppsPath") + ID + runnableFilename)
 	if os.IsNotExist(err) {
 
-		_, err := os.Create(edgeAppPath + ID + runnableFilename)
+		_, err := os.Create(utils.GetPath("edgeAppsPath") + ID + runnableFilename)
 		result = true
 
 		if err != nil {
@@ -269,7 +154,7 @@ func SetEdgeAppInstalled(ID string) bool {
 func SetEdgeAppNotInstalled(ID string) bool {
 
 	result := true
-	err := os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
+	err := os.Remove(utils.GetPath("edgeAppsPath") + ID + runnableFilename)
 	if err != nil {
 		result = false
 		log.Fatal(err)
@@ -288,7 +173,7 @@ func GetEdgeApps() []EdgeApp {
 
 	// Building list of available edgeapps in the system with their status
 
-	files, err := ioutil.ReadDir(utils.GetPath(utils.EdgeAppsPath))
+	files, err := ioutil.ReadDir(utils.GetPath("edgeAppsPath"))
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -351,18 +236,18 @@ func GetEdgeAppStatus(ID string) EdgeAppStatus {
 
 }
 
-// GetEdgeAppServices : Returns a
+// GetEdgeAppServices : Returns a list of services for a single edgeapp
 func GetEdgeAppServices(ID string) []EdgeAppService {
-	wsPath := utils.GetPath(utils.WsPath)
+
-	cmdArgs := []string{"-r", ".services | keys[]", utils.GetPath(utils.EdgeAppsPath) + ID + configFilename}
+	cmdArgs := []string{"-r", ".services | keys[]", utils.GetPath("edgeAppsPath") + ID + configFilename}
-	servicesString := utils.Exec(utils.GetPath(utils.WsPath), "yq", cmdArgs)
+	servicesString := utils.Exec(utils.GetPath("wsPath"), "yq", cmdArgs)
 	serviceSlices := strings.Split(servicesString, "\n")
 	serviceSlices = utils.DeleteEmptySlices(serviceSlices)
 	var edgeAppServices []EdgeAppService
 
 	for _, serviceID := range serviceSlices {
-		cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
+		cmdArgs = []string{"-f", utils.GetPath("wsPath") + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
-		cmdResult := utils.Exec(wsPath, "docker-compose", cmdArgs)
+		cmdResult := utils.Exec(utils.GetPath("wsPath"), "docker-compose", cmdArgs)
 		isRunning := false
 		if cmdResult != "" {
 			isRunning = true
@@ -376,14 +261,16 @@ func GetEdgeAppServices(ID string) []EdgeAppService {
 
 // RunEdgeApp : Run an EdgeApp and return its most current status
 func RunEdgeApp(ID string) EdgeAppStatus {
-	wsPath := utils.GetPath(utils.WsPath)
+
 	services := GetEdgeAppServices(ID)
+
 	cmdArgs := []string{}
 
 	for _, service := range services {
 
-		cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "start", service.ID}
+		cmdArgs = []string{"-f", utils.GetPath("wsPath") + "/docker-compose.yml", "start", service.ID}
-		utils.Exec(wsPath, "docker-compose", cmdArgs)
+		utils.Exec(utils.GetPath("wsPath"), "docker-compose", cmdArgs)
+
 	}
 
 	// Wait for it to settle up before continuing...
@@ -395,13 +282,16 @@ func RunEdgeApp(ID string) EdgeAppStatus {
 
 // StopEdgeApp : Stops an EdgeApp and return its most current status
 func StopEdgeApp(ID string) EdgeAppStatus {
-	wsPath := utils.GetPath(utils.WsPath)
+
 	services := GetEdgeAppServices(ID)
+
 	cmdArgs := []string{}
+
 	for _, service := range services {
 
-		cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "stop", service.ID}
+		cmdArgs = []string{"-f", utils.GetPath("wsPath") + "/docker-compose.yml", "stop", service.ID}
-		utils.Exec(wsPath, "docker-compose", cmdArgs)
+		utils.Exec(utils.GetPath("wsPath"), "docker-compose", cmdArgs)
+
 	}
 
 	// Wait for it to settle up before continuing...
@@ -411,43 +301,13 @@ func StopEdgeApp(ID string) EdgeAppStatus {
 
 }
 
-// StopAllEdgeApps: Stops all EdgeApps and returns a count of how many were stopped
-func StopAllEdgeApps() int {
-	edgeApps := GetEdgeApps()
-	appCount := 0
-	for _, edgeApp := range edgeApps {
-		StopEdgeApp(edgeApp.ID)
-		appCount++
-	}
-
-	return appCount
-
-}
-
-// StartAllEdgeApps: Starts all EdgeApps and returns a count of how many were started
-func StartAllEdgeApps() int {	
-	edgeApps := GetEdgeApps()
-	appCount := 0
-	for _, edgeApp := range edgeApps {
-		RunEdgeApp(edgeApp.ID)
-		appCount++
-	}
-
-	return appCount
-
-}
-
-func RestartEdgeAppsService() {
-	buildFrameworkContainers()
-}
-
 // EnableOnline : Write environment file and rebuild the necessary containers. Rebuilds containers in project (in case of change only)
 func EnableOnline(ID string, InternetURL string) MaybeEdgeApp {
 
 	maybeEdgeApp := GetEdgeApp(ID)
 	if maybeEdgeApp.Valid { // We're only going to do this operation if the EdgeApp actually exists.
 		// Create the myedgeapp.env file and add the InternetURL entry to it
-		envFilePath := utils.GetPath(utils.EdgeAppsPath) + ID + myEdgeAppServiceEnvFilename
+		envFilePath := utils.GetPath("edgeAppsPath") + ID + myEdgeAppServiceEnvFilename
 		env, _ := godotenv.Unmarshal("INTERNET_URL=" + InternetURL)
 		_ = godotenv.Write(env, envFilePath)
 	}
@@ -461,13 +321,13 @@ func EnableOnline(ID string, InternetURL string) MaybeEdgeApp {
 // DisableOnline : Removes env files necessary for system external access config. Rebuilds containers in project (in case of change only).
 func DisableOnline(ID string) MaybeEdgeApp {
 
-	envFilePath := utils.GetPath(utils.EdgeAppsPath) + ID + myEdgeAppServiceEnvFilename
+	envFilePath := utils.GetPath("edgeAppsPath") + ID + myEdgeAppServiceEnvFilename
 	_, err := godotenv.Read(envFilePath)
 	if err != nil {
 		log.Println("myedge.app environment file for " + ID + " not found. No need to delete.")
 	} else {
 		cmdArgs := []string{envFilePath}
-		utils.Exec(utils.GetPath(utils.WsPath), "rm", cmdArgs)
+		utils.Exec(utils.GetPath("wsPath"), "rm", cmdArgs)
 	}
 
 	buildFrameworkContainers()
@@ -478,7 +338,7 @@ func DisableOnline(ID string) MaybeEdgeApp {
 
 func EnablePublicDashboard(InternetURL string) bool {
 
-	envFilePath := utils.GetPath(utils.ApiPath) + myEdgeAppServiceEnvFilename
+	envFilePath := utils.GetPath("apiPath") + myEdgeAppServiceEnvFilename
 	env, _ := godotenv.Unmarshal("INTERNET_URL=" + InternetURL)
 	_ = godotenv.Write(env, envFilePath)
 
@@ -489,29 +349,28 @@ func EnablePublicDashboard(InternetURL string) bool {
 }
 
 func DisablePublicDashboard() bool {
-	envFilePath := utils.GetPath(utils.ApiPath) + myEdgeAppServiceEnvFilename
+	envFilePath := utils.GetPath("apiPath") + myEdgeAppServiceEnvFilename
 	if !IsPublicDashboard() {
 		log.Println("myedge.app environment file for the dashboard / api not found. No need to delete.")
 		return false
 	}
 
 	cmdArgs := []string{envFilePath}
-	utils.Exec(utils.GetPath(utils.ApiPath), "rm", cmdArgs)
+	utils.Exec(utils.GetPath("apiPath"), "rm", cmdArgs)
 	buildFrameworkContainers()
 	return true
 }
 
 func IsPublicDashboard() bool {
-	envFilePath := utils.GetPath(utils.ApiPath) + myEdgeAppServiceEnvFilename
+	envFilePath := utils.GetPath("apiPath") + myEdgeAppServiceEnvFilename
 	_, err := godotenv.Read(envFilePath)
 	return err == nil
 }
 
 func buildFrameworkContainers() {
 
-	wsPath := utils.GetPath(utils.WsPath)
+	cmdArgs := []string{utils.GetPath("wsPath") + "ws", "--build"}
-	cmdArgs := []string{wsPath + "ws", "--build"}
+	utils.ExecAndStream(utils.GetPath("wsPath"), "sh", cmdArgs)
-	utils.ExecAndStream(wsPath, "sh", cmdArgs)
 
 	time.Sleep(defaultContainerOperationSleepTime)
 

internal/storage/storage.go

@@ -224,9 +224,9 @@ func getDevicesSpaceUsage(devices []Device) []Device {
 					bucketsUsageSplit := (uint64)(0)
 					othersUsageSplit := (uint64)(0)
 
-					edgeappsDirSize, _ := getDirSize(utils.GetPath(utils.EdgeAppsPath))
+					edgeappsDirSize, _ := getDirSize(utils.GetPath("edgeAppsPath"))
 					// TODO for later: Figure out to get correct paths for each partition...
-					wsAppDataDirSize, _ := getDirSize(utils.GetPath(utils.WsPath) + "/appdata")
+					wsAppDataDirSize, _ := getDirSize("/home/system/components/ws/appdata")
 
 					if partition.Mountpoint == "/" {
 						edgeappsUsageSplit = edgeappsDirSize + wsAppDataDirSize

internal/system/system.go

@@ -4,26 +4,13 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"log"
-	"os"
-	"io"
-	"os/exec"
-	"bufio"
-	"path/filepath"
-	"io/ioutil"
-	"encoding/json"
 
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 
-	"github.com/joho/godotenv"
 	"github.com/shirou/gopsutil/host"
-)
+	"github.com/joho/godotenv"
 
-type cloudflaredTunnelJson struct {
+)
-	AccountTag string `json:"AccountTag"`
-	TunnelSecret string `json:"TunnelSecret"`
-	TunnelID string `json:"TunnelID"`
-}
 
 // GetUptimeInSeconds: Returns a value (as string) of the total system uptime
 func GetUptimeInSeconds() string {
@@ -77,8 +64,7 @@ func GetHostname() string {
 func SetupCloudOptions() {
 
 	var cloudEnv map[string]string
-	cloudEnvFileLocationPath := utils.GetPath(utils.CloudEnvFileLocation)
+	cloudEnv, err := godotenv.Read(utils.GetPath("cloudEnvFileLocation"))
-	cloudEnv, err := godotenv.Read(cloudEnvFileLocationPath)
 
 	if err != nil {
 		fmt.Println("Error loading .env file for cloud version setup")
@@ -92,336 +78,11 @@ func SetupCloudOptions() {
 		utils.WriteOption("EMAIL", cloudEnv["EMAIL"])
 	}
 
-	if cloudEnv["USERNAME"] != "" {
-		utils.WriteOption("USERNAME", cloudEnv["USERNAME"])
-	}
-
-	if cloudEnv["CLUSTER"] != "" {
-		utils.WriteOption("CLUSTER", cloudEnv["CLUSTER"])
-	}
-
-	if cloudEnv["CLUSTER_IP"] != "" {
-		utils.WriteOption("CLUSTER_IP", cloudEnv["CLUSTER_IP"])
-	}
-
-	if cloudEnv["CLUSTER_SSH_PORT"] != "" {
-		utils.WriteOption("CLUSTER_SSH_PORT", cloudEnv["CLUSTER_SSH_PORT"])
-	}
-
 	if cloudEnv["EDGEBOXIO_API_TOKEN"] != "" {
 		utils.WriteOption("EDGEBOXIO_API_TOKEN", cloudEnv["EDGEBOXIO_API_TOKEN"])
 	}
 
 	// In the end of this operation takes place, remove the env file as to not overwrite any options once they are set.
-	utils.Exec("/", "rm", []string{cloudEnvFileLocationPath})
+	utils.Exec("/", "rm", []string{utils.GetPath("cloudEnvFileLocation")})
+
 }
-
-func StartSystemLogger() {
-	fmt.Println("Starting system logger")
-	loggerPath := utils.GetPath(utils.LoggerPath)
-	utils.Exec(loggerPath, "make", []string{"start"})
-}
-
-// UpdateSystemLoggerServices: Updates the services.txt file with the services that are currently running
-func UpdateSystemLoggerServices(services []string) {
-	fmt.Println("Updating system logger services:")
-	fmt.Println(services)
-	loggerPath := utils.GetPath(utils.LoggerPath)
-
-	utils.Exec(loggerPath, "bash", []string{"-c", "rm services.txt && touch services.txt"})
-
-	for _, service := range services {
-		fmt.Println("Adding " + service + " to services.txt")
-		utils.Exec(loggerPath, "bash", []string{"-c", "echo " + service + " >> services.txt"})
-	}
-
-	// Add empty line at the end of file (best practice)
-	utils.Exec(loggerPath, "bash", []string{"-c", "echo '' >> services.txt"})
-}
-
-// StartWs: Starts the webserver service for Edgeapps
-func StartWs() {
-	wsPath := utils.GetPath(utils.WsPath)
-	fmt.Println("Starting WS")
-	cmdargs := []string{"-b"}
-	utils.Exec(wsPath, "./ws", cmdargs)
-}
-
-// StartService: Starts a service
-func StartService(serviceID string) {
-	wsPath := utils.GetPath(utils.WsPath)
-	fmt.Println("Starting" + serviceID + "service")
-	cmdargs := []string{"start", serviceID}
-	utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-// StopService: Stops a service
-func StopService(serviceID string) {
-	wsPath := utils.GetPath(utils.WsPath)
-	fmt.Println("Stopping" + serviceID + "service")
-	cmdargs := []string{"stop", "cloudflared"}
-	utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-// RestartService: Restarts a service
-func RestartService(serviceID string) {
-	wsPath := utils.GetPath(utils.WsPath)	
-	fmt.Println("Restarting" + serviceID + "service")
-	cmdargs := []string{"restart", serviceID}
-	utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-// GetServiceStatus: Returns the status output of a service
-func GetServiceStatus(serviceID string) string {
-	wsPath := utils.GetPath(utils.WsPath)	
-	cmdargs := []string{"status", serviceID}
-	return utils.Exec(wsPath, "systemctl", cmdargs)
-}
-
-func CreateBackupsPasswordFile(password string) {
-	// Create a password file for backups
-	backupPasswordFile := utils.GetPath(utils.BackupPasswordFileLocation)
-	backupPasswordFileDir := filepath.Dir(backupPasswordFile)
-
-	if _, err := os.Stat(backupPasswordFileDir); os.IsNotExist(err) {
-		os.MkdirAll(backupPasswordFileDir, 0755)
-	}
-
-	// Write the password to the file, overriting an existing file
-	err := ioutil.WriteFile(backupPasswordFile, []byte(password), 0644)
-	if err != nil {
-		panic(err)
-	}
-} 
-
-// CreateTunnel: Creates a tunnel via cloudflared, needs to be authenticated first
-func CreateTunnel(configDestination string) {
-	fmt.Println("Creating Tunnel for Edgebox.")
-	cmd := exec.Command("sh", "/home/system/components/edgeboxctl/scripts/cloudflared_tunnel_create.sh")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	for scanner.Scan() {
-		fmt.Println(scanner.Text())
-		text := scanner.Text()
-		fmt.Println(text)
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		panic(scanner.Err())
-	}
-
-	// This also needs to be executed in root and non root variants
-	fmt.Println("Reading cloudflared folder to get the JSON file.")
-	isRoot := false
-	dir := "/home/system/.cloudflared/"
-	dir2 := "/root/.cloudflared/"
-	files, err := os.ReadDir(dir)
-	if err != nil {
-		panic(err)
-	}
-
-	var jsonFile os.DirEntry
-	for _, file := range files {
-		// check if file has json extension
-		if filepath.Ext(file.Name()) == ".json" {
-			fmt.Println("Non-Root JSON file found: " + file.Name())
-			jsonFile = file
-		}
-	}
-
-	// If the files are not in the home folder, try the root folder
-	if jsonFile == nil {
-		files, err = os.ReadDir(dir2)
-		if err != nil {
-			panic(err)
-		}
-		for _, file := range files {
-			// check if file has json extension
-			if filepath.Ext(file.Name()) == ".json" {
-				fmt.Println("Root JSON file found: " + file.Name())
-				jsonFile = file
-				isRoot = true
-			}
-		}
-	}
-
-	if jsonFile == nil {
-		panic("No JSON file found in directory")
-	}
-
-	fmt.Println("Reading JSON file.")
-	targetDir := "/home/system/.cloudflared/"
-	if isRoot {
-		targetDir = "/root/.cloudflared/"
-	}
-
-	jsonFilePath := filepath.Join(targetDir, jsonFile.Name())
-	jsonBytes, err := ioutil.ReadFile(jsonFilePath)
-	if err != nil {
-		panic(err)
-	}
-
-	fmt.Println("Parsing JSON file.")
-	var data cloudflaredTunnelJson
-	err = json.Unmarshal(jsonBytes, &data)
-	if err != nil {
-		log.Printf("Error reading tunnel JSON file: %s", err)
-	}
-
-	fmt.Println("Tunnel ID is:" + data.TunnelID)
-
-	// create the config.yml file with the following content in each line:
-	// "url": "http://localhost:80"
-	// "tunnel": "<TunnelID>"
-	// "credentials-file": "/root/.cloudflared/<tunnelID>.json"
-
-	file := configDestination
-	f, err := os.Create(file)
-	if err != nil {
-		panic(err)
-	}
-
-	defer f.Close()
-
-	_, err = f.WriteString("url: http://localhost:80\ntunnel: " + data.TunnelID + "\ncredentials-file: " + jsonFilePath)
-
-	if err != nil {
-		panic(err)
-	}
-}
-
-// DeleteTunnel: Deletes a tunnel via cloudflared, this does not remove the service
-func DeleteTunnel() {
-	fmt.Println("Deleting possible previous tunnel.")
-	
-	// Configure the service and start it
-	cmd := exec.Command("sh", "/home/system/components/edgeboxctl/scripts/cloudflared_tunnel_delete.sh")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	for scanner.Scan() {
-		fmt.Println(scanner.Text())
-		text := scanner.Text()
-		fmt.Println(text)
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		panic(scanner.Err())
-	}
-}
-
-// InstallTunnelService: Installs the tunnel service
-func InstallTunnelService(config string) {
-	fmt.Println("Installing cloudflared service.")
-	cmd := exec.Command("cloudflared", "--config", config, "service", "install")
-	cmd.Start()
-	cmd.Wait()
-}
-
-// RemoveTunnelService: Removes the tunnel service
-func RemoveTunnelService() {
-	wsPath := utils.GetPath(utils.WsPath)	
-	fmt.Println("Removing possibly previous service install.")
-	cmd := exec.Command("cloudflared", "service", "uninstall")
-	cmd.Start()
-	cmd.Wait()
-
-	fmt.Println("Removing cloudflared files")
-	cmdargs := []string{"-rf", "/home/system/.cloudflared"}
-	utils.Exec(wsPath, "rm", cmdargs)
-	cmdargs = []string{"-rf", "/etc/cloudflared/config.yml"}
-	utils.Exec(wsPath, "rm", cmdargs)
-	cmdargs = []string{"-rf", "/root/.cloudflared/cert.pem"}
-	utils.Exec(wsPath, "rm", cmdargs)
-}
-
-func CopyDir(src string, dest string) error {
-    srcInfo, err := os.Stat(src)
-    if err != nil {
-        return err
-    }
-    if !srcInfo.IsDir() {
-        return fmt.Errorf("%s is not a directory", src)
-    }
-
-    err = os.MkdirAll(dest, srcInfo.Mode())
-    if err != nil {
-        return err
-    }
-
-    items, err := ioutil.ReadDir(src)
-    if err != nil {
-        return err
-    }
-
-    for _, item := range items {
-        srcPath := filepath.Join(src, item.Name())
-        destPath := filepath.Join(dest, item.Name())
-
-        if item.IsDir() {
-            err = CopyDir(srcPath, destPath)
-            if err != nil {
-                fmt.Printf("error copying directory %s to %s: %s\n", srcPath, destPath, err.Error())
-            }
-        } else {
-            err = CopyFile(srcPath, destPath)
-            if err != nil {
-                fmt.Printf("error copying file %s to %s: %s\n", srcPath, destPath, err.Error())
-            }
-        }
-    }
-
-    return nil
-}
-
-func CopyFile(src string, dest string) error {
-    srcFile, err := os.Open(src)
-    if err != nil {
-        return err
-    }
-    defer srcFile.Close()
-
-    destFile, err := os.Create(dest)
-    if err != nil {
-        return err
-    }
-    defer destFile.Close()
-
-    _, err = io.Copy(destFile, srcFile)
-    if err != nil {
-        return err
-    }
-
-    err = destFile.Sync()
-    if err != nil {
-        return err
-    }
-
-    srcInfo, err := os.Stat(src)
-    if err != nil {
-        return err
-    }
-
-    err = os.Chmod(dest, srcInfo.Mode())
-    if err != nil {
-        return err
-    }
-
-    return nil
-}
-

internal/tasks/tasks.go

@@ -7,17 +7,12 @@ import (
 	"log"
 	"strconv"
 	"time"
-	"os/exec"
-	"strings"
-	"os"
-	"bufio"
 
 	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/edgeapps"
 	"github.com/edgebox-iot/edgeboxctl/internal/storage"
 	"github.com/edgebox-iot/edgeboxctl/internal/system"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
-
 	_ "github.com/go-sql-driver/mysql" // Mysql Driver
 	_ "github.com/mattn/go-sqlite3"    // SQlite Driver
 )
@@ -33,14 +28,11 @@ type Task struct {
 	Updated string         `json:"updated"`
 }
 
-// TaskOption: Struct for Task Options (kv pair)
-type TaskOption struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
-}
-
 type taskSetupTunnelArgs struct {
-	DomainName string `json:"domain_name"`
+	BootnodeAddress string `json:"bootnode_address"`
+	BootnodeToken   string `json:"bootnode_token"`
+	AssignedAddress string `json:"assigned_address"`
+	NodeName        string `json:"node_name"`
 }
 
 type taskStartEdgeAppArgs struct {
@@ -59,12 +51,6 @@ type taskStopEdgeAppArgs struct {
 	ID string `json:"id"`
 }
 
-type taskSetEdgeAppOptionsArgs struct {
-	ID string `json:"id"`
-	// Options should be an array of "key":"value" pairs
-	Options []TaskOption `json:"options"`
-}
-
 type taskEnableOnlineArgs struct {
 	ID          string `json:"id"`
 	InternetURL string `json:"internet_url"`
@@ -78,20 +64,28 @@ type taskEnablePublicDashboardArgs struct {
 	InternetURL string `json:"internet_url"`
 }
 
-type taskSetupBackupsArgs struct {
-	Service string `json:"service"`
-	AccessKeyID string `json:"access_key_id"`
-	SecretAccessKey string `json:"secret_access_key"`
-	RepositoryName string `json:"repository_name"`
-	RepositoryPassword string `json:"repository_password"`
-}
-
-
 const STATUS_CREATED int = 0
 const STATUS_EXECUTING int = 1
 const STATUS_FINISHED int = 2
 const STATUS_ERROR int = 3
 
+func GetBaseTask(taskCode string, argsString string) Task {
+	currentFormattedTime := utils.GetFormattedDateTime(time.Now())
+	task := Task{
+		ID:   0,
+		Task: taskCode,
+		Args: sql.NullString{
+			String: argsString,
+			Valid:  true,
+		},
+		Status:  fmt.Sprintf("%d", STATUS_CREATED),
+		Created: currentFormattedTime,
+		Updated: currentFormattedTime,
+	}
+
+	return task
+}
+
 // GetNextTask : Performs a MySQL query over the device's Edgebox API
 func GetNextTask() Task {
 
@@ -142,9 +136,8 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now())
+	formatedDatetime := utils.GetFormattedDateTime(time.Now())
 
-	fmt.Println("Changing task status to executing: " + task.Task)
 	_, err = statement.Exec(STATUS_EXECUTING, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement
 	if err != nil {
 		log.Fatal(err.Error())
@@ -153,77 +146,25 @@ func ExecuteTask(task Task) Task {
 	if diagnostics.GetReleaseVersion() == diagnostics.DEV_VERSION {
 		log.Printf("Dev environemnt. Not executing tasks.")
 	} else {
-		log.Println("Task: " + task.Task)
+		// log.Println("Task: " + task.Task)
-		log.Println("Args: " + task.Args.String)
+		// log.Println("Args: " + task.Args.String)
 		switch task.Task {
-		case "setup_backups":
-
-			log.Println("Setting up Backups Destination...")
-			var args taskSetupBackupsArgs
-			err := json.Unmarshal([]byte(task.Args.String), &args)
-			if err != nil {
-				log.Println("Error reading arguments of setup_backups task.")
-			} else {
-				taskResult := taskSetupBackups(args)
-				taskResultBool := true
-				// Check if returned taskResult string contains "error"
-				if strings.Contains(taskResult, "error") {
-					taskResultBool = false
-				}
-				task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
-			}
-
-		case "start_backup":
-
-			log.Println("Backing up Edgebox...")
-			taskResult := taskBackup()
-			taskResultBool := true
-			// Check if returned taskResult string contains "error"
-			if strings.Contains(taskResult, "error") {
-				taskResultBool = false
-			}
-			task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
-
-		case "restore_backup":
-			log.Println("Attempting to Restore Last Backup to Edgebox")
-			taskResult := taskRestoreBackup()
-			taskResultBool := true
-			// Check if returned taskResult string contains "error"
-			if strings.Contains(taskResult, "error") {
-				taskResultBool = false
-			}
-			task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
-
 		case "setup_tunnel":
 
-			log.Println("Setting up Cloudflare Tunnel...")
+			log.Println("Setting up bootnode connection...")
 			var args taskSetupTunnelArgs
 			err := json.Unmarshal([]byte(task.Args.String), &args)
 			if err != nil {
-				log.Printf("Error reading arguments of setup_tunnel task: %s", err)
+				log.Printf("Error reading arguments of setup_bootnode task: %s", err)
-				status := "{\"status\": \"error\", \"message\": \"The Domain Name you are going to Authorize must be provided beforehand! Please insert a domain name and try again.\"}"
-				utils.WriteOption("TUNNEL_STATUS", status)
 			} else {
 				taskResult := taskSetupTunnel(args)
 				task.Result = sql.NullString{String: taskResult, Valid: true}
 			}
 
-		case "start_tunnel":
+		case "list_edgeapps":
 
-			log.Println("Starting Cloudflare Tunnel...")
+			log.Println("Fetching current status on Edgeapps...")
-			taskResult := taskStartTunnel()
+			taskResult := taskGetEdgeApps()
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-
-		case "stop_tunnel":
-
-			log.Println("Stopping Cloudflare Tunnel...")
-			taskResult := taskStopTunnel()
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		
-		case "disable_tunnel":
-
-			log.Println("Disabling Cloudflare Tunnel...")
-			taskResult := taskDisableTunnel()
 			task.Result = sql.NullString{String: taskResult, Valid: true}
 
 		case "install_edgeapp":
@@ -274,19 +215,6 @@ func ExecuteTask(task Task) Task {
 				task.Result = sql.NullString{String: taskResult, Valid: true}
 			}
 
-		case "set_edgeapp_options":
-
-			log.Println("Setting EdgeApp Options...")
-			var args taskSetEdgeAppOptionsArgs
-			// {"id":"podgrab","options":{"PODGRAB_PASSWORD":"fumarmata"}}
-			err := json.Unmarshal([]byte(task.Args.String), &args)
-			if err != nil {
-				log.Printf("Error reading arguments of set_edgeapp_options task: %s", err)
-			} else {
-				taskResult := taskSetEdgeAppOptions(args)
-				task.Result = sql.NullString{String: taskResult, Valid: true}
-			}
-
 		case "enable_online":
 
 			log.Println("Enabling online access to EdgeApp...")
@@ -341,16 +269,14 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	formatedDatetime = utils.GetSQLiteFormattedDateTime(time.Now())
+	formatedDatetime = utils.GetFormattedDateTime(time.Now())
 
 	if task.Result.Valid {
-		fmt.Println("Task Result: " + task.Result.String)
 		_, err = statement.Exec(STATUS_FINISHED, task.Result.String, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with result info
 		if err != nil {
 			log.Fatal(err.Error())
 		}
 	} else {
-		fmt.Println("Error executing task with result: " + task.Result.String)
 		_, err = statement.Exec(STATUS_ERROR, "Error", formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with Error info
 		if err != nil {
 			log.Fatal(err.Error())
@@ -399,9 +325,8 @@ func ExecuteSchedules(tick int) {
 		log.Println("Uptime is " + uptime + " seconds (" + system.GetUptimeFormatted() + ")")
 
 		log.Println(taskGetStorageDevices())
-		taskStartWs()
 		log.Println(taskGetEdgeApps())
-		taskUpdateSystemLoggerServices()
+
 	}
 
 	if tick%5 == 0 {
@@ -413,32 +338,6 @@ func ExecuteSchedules(tick int) {
 	if tick%30 == 0 {
 		// Executing every 30 ticks
 		log.Println(taskGetEdgeApps())
-		taskUpdateSystemLoggerServices()
-		// RESET SOME VARIABLES HERE IF NEEDED, SINCE SYSTEM IS UNBLOCKED
-		utils.WriteOption("BACKUP_IS_WORKING", "0")
-
-		// Check is Last Backup time (in unix time) is older than 1 h
-		lastBackup := utils.ReadOption("BACKUP_LAST_RUN")
-		if lastBackup != "" {
-			lastBackupTime, err := strconv.ParseInt(lastBackup, 10, 64)
-			if err != nil {
-				log.Println("Error parsing last backup time: " + err.Error())
-			} else {
-				secondsSinceLastBackup := time.Now().Unix() - lastBackupTime
-				if secondsSinceLastBackup > 3600 {
-					// If last backup is older than 1 hour, set BACKUP_IS_WORKING to 0
-					log.Println("Last backup was older than 1 hour, performing auto backup...")
-					log.Println(taskAutoBackup())
-				} else {
-
-					log.Println("Last backup is " + fmt.Sprint(secondsSinceLastBackup) + " seconds old (less than 1 hour ago), skipping auto backup...")
-		
-				}
-			}
-		} else {
-			log.Println("Last backup time not found, skipping performing auto backup...")
-		}
-
 	}
 
 	if tick%60 == 0 {
@@ -446,455 +345,28 @@ func ExecuteSchedules(tick int) {
 		log.Println("System IP is: " + ip)
 	}
 
-	if tick%3600 == 0 {
-		// Executing every 3600 ticks (1 hour)
-	}
-
-	if tick%86400 == 0 {
-		// Executing every 86400 ticks (+/1 day)
-		// Ensuring we run a normal build, setting up avahi domain names fresh in the network
-		taskStartWs()
-	}
-
 	// Just add a schedule here if you need a custom one (every "tick hour", every "tick day", etc...)
 
 }
 
-func taskSetupBackups(args taskSetupBackupsArgs) string {
-	fmt.Println("Executing taskSetupBackups" + args.Service)
-	// ...
-	service_url := ""
-	key_id_name := "AWS_ACCESS_KEY_ID"
-	key_secret_name := "AWS_SECRET_ACCESS_KEY"
-	repo_location := "/home/system/components/apps/"
-	service_found := false
-
-	switch args.Service {
-		case "s3":
-			service_url = "s3.amazonaws.com/"
-			service_found = true
-		case "b2":
-			service_url = ""
-			key_id_name = "B2_ACCOUNT_ID"
-			key_secret_name = "B2_ACCOUNT_KEY"
-			service_found = true
-		case "wasabi":
-			service_found = true
-			service_url = "s3.wasabisys.com/"
-	}
-
-	if !service_found {
-		fmt.Println("Service not found")
-		return "{\"status\": \"error\", \"message\": \"Service not found\"}"
-	}
-
-	fmt.Println("Creating env vars for authentication with backup service")
-	os.Setenv(key_id_name, args.AccessKeyID)
-	os.Setenv(key_secret_name, args.SecretAccessKey)
-
-	fmt.Println("Creating restic password file")
-	
-	system.CreateBackupsPasswordFile(args.RepositoryPassword)
-
-	fmt.Println("Initializing restic repository")
-	utils.WriteOption("BACKUP_IS_WORKING", "1")
-
-	cmdArgs := []string{"-r", args.Service + ":" + service_url + args.RepositoryName + ":" + repo_location, "init", "--password-file", utils.GetPath(utils.BackupPasswordFileLocation), "--verbose=3"}
-	
-	result := utils.ExecAndStream(repo_location, "restic", cmdArgs)
-
-	utils.WriteOption("BACKUP_IS_WORKING", "0")
-
-	// Write backup settings to table
-	utils.WriteOption("BACKUP_SERVICE", args.Service)
-	utils.WriteOption("BACKUP_SERVICE_URL", service_url)
-	utils.WriteOption("BACKUP_REPOSITORY_NAME", args.RepositoryName)
-	utils.WriteOption("BACKUP_REPOSITORY_PASSWORD", args.RepositoryPassword)
-	utils.WriteOption("BACKUP_REPOSITORY_ACCESS_KEY_ID", args.AccessKeyID)
-	utils.WriteOption("BACKUP_REPOSITORY_SECRET_ACCESS_KEY", args.SecretAccessKey)
-	utils.WriteOption("BACKUP_REPOSITORY_LOCATION", repo_location)
-
-	// See if result contains the substring "Fatal:"
-	if strings.Contains(result, "Fatal:") {
-		fmt.Println("Error initializing restic repository")
-
-		utils.WriteOption("BACKUP_STATUS", "error")
-		utils.WriteOption("BACKUP_ERROR_MESSAGE", result)
-
-		return "{\"status\": \"error\", \"message\": \"" + result + "\"}"
-	}
-
-	// Save options to database
-	utils.WriteOption("BACKUP_STATUS", "initiated")
-
-	// Populate Stats right away
-	taskGetBackupStatus()
-	
-	return "{\"status\": \"ok\"}"
-	
-}
-
-func taskRemoveBackups() string {
-
-	fmt.Println("Executing taskRemoveBackups")
-
-	// ...	This deletes the restic repository
-	// cmdArgs := []string{"-r", "s3:https://s3.amazonaws.com/edgebox-backups:/home/system/components/apps/", "forget", "latest", "--password-file", utils.GetPath(utils.BackupPasswordFileLocation), "--verbose=3"}
-	
-	utils.WriteOption("BACKUP_STATUS", "")
-	utils.WriteOption("BACKUP_IS_WORKING", "0")
-
-	return "{\"status\": \"ok\"}"
-	
-}
-
-func taskBackup() string {
-	fmt.Println("Executing taskBackup")
-
-	// Load Backup Options
-	backup_service := utils.ReadOption("BACKUP_SERVICE")
-	backup_service_url := utils.ReadOption("BACKUP_SERVICE_URL")
-	backup_repository_name := utils.ReadOption("BACKUP_REPOSITORY_NAME")
-	// backup_repository_password := utils.ReadOption("BACKUP_REPOSITORY_PASSWORD")
-	backup_repository_access_key_id := utils.ReadOption("BACKUP_REPOSITORY_ACCESS_KEY_ID")
-	backup_repository_secret_access_key := utils.ReadOption("BACKUP_REPOSITORY_SECRET_ACCESS_KEY")
-	backup_repository_location := utils.ReadOption("BACKUP_REPOSITORY_LOCATION")
-
-	key_id_name := "AWS_ACCESS_KEY_ID"
-	key_secret_name := "AWS_SECRET_ACCESS_KEY"
-	service_found := false
-
-	switch backup_service {
-		case "s3":
-			service_found = true
-		case "b2":
-			key_id_name = "B2_ACCOUNT_ID"
-			key_secret_name = "B2_ACCOUNT_KEY"
-			service_found = true
-		case "wasabi":
-			service_found = true
-	}
-
-	if !service_found {
-		fmt.Println("Service not found")
-		return "{\"status\": \"error\", \"message\": \"Backup Service not found\"}"
-	}
-
-	fmt.Println("Creating env vars for authentication with backup service")
-	fmt.Println(key_id_name)
-	os.Setenv(key_id_name, backup_repository_access_key_id)
-	fmt.Println(key_secret_name)
-	os.Setenv(key_secret_name, backup_repository_secret_access_key)
-
-
-	utils.WriteOption("BACKUP_IS_WORKING", "1")
-
-	// ...	This backs up the restic repository
-	cmdArgs := []string{"-r", backup_service + ":" + backup_service_url + backup_repository_name + ":" + backup_repository_location, "backup", backup_repository_location, "--password-file", utils.GetPath(utils.BackupPasswordFileLocation), "--verbose=3"}
-	result := utils.ExecAndStream(backup_repository_location, "restic", cmdArgs)
-
-	utils.WriteOption("BACKUP_IS_WORKING", "0")
-	// Write as Unix timestamp
-	utils.WriteOption("BACKUP_LAST_RUN", strconv.FormatInt(time.Now().Unix(), 10))
-
-	// See if result contains the substring "Fatal:"
-	if strings.Contains(result, "Fatal:") {
-		fmt.Println("Error backing up")
-		utils.WriteOption("BACKUP_STATUS", "error")
-		utils.WriteOption("BACKUP_ERROR_MESSAGE", result)
-		return "{\"status\": \"error\", \"message\": \"" + result + "\"}"
-	}
-
-	utils.WriteOption("BACKUP_STATUS", "working")
-	taskGetBackupStatus()
-	return "{\"status\": \"ok\"}"
-	
-}
-
-func taskRestoreBackup() string {
-	fmt.Println("Executing taskRestoreBackup")
-
-	// Load Backup Options
-	backup_service := utils.ReadOption("BACKUP_SERVICE")
-	backup_service_url := utils.ReadOption("BACKUP_SERVICE_URL")
-	backup_repository_name := utils.ReadOption("BACKUP_REPOSITORY_NAME")
-	// backup_repository_password := utils.ReadOption("BACKUP_REPOSITORY_PASSWORD")
-	backup_repository_access_key_id := utils.ReadOption("BACKUP_REPOSITORY_ACCESS_KEY_ID")
-	backup_repository_secret_access_key := utils.ReadOption("BACKUP_REPOSITORY_SECRET_ACCESS_KEY")
-	backup_repository_location := utils.ReadOption("BACKUP_REPOSITORY_LOCATION")
-
-	key_id_name := "AWS_ACCESS_KEY_ID"
-	key_secret_name := "AWS_SECRET_ACCESS_KEY"
-	service_found := false
-
-	switch backup_service {
-		case "s3":
-			service_found = true
-		case "b2":
-			key_id_name = "B2_ACCOUNT_ID"
-			key_secret_name = "B2_ACCOUNT_KEY"
-			service_found = true
-		case "wasabi":
-			service_found = true
-	}
-
-	if !service_found {
-		fmt.Println("Service not found")
-		return "{\"status\": \"error\", \"message\": \"Backup Service not found\"}"
-	}
-
-	fmt.Println("Creating env vars for authentication with backup service")
-	fmt.Println(key_id_name)
-	os.Setenv(key_id_name, backup_repository_access_key_id)
-	fmt.Println(key_secret_name)
-	os.Setenv(key_secret_name, backup_repository_secret_access_key)
-
-
-	utils.WriteOption("BACKUP_IS_WORKING", "1")
-
-	fmt.Println("Stopping All EdgeApps")
-	// Stop All EdgeApps
-	edgeapps.StopAllEdgeApps()
-
-	// Copy all files in /home/system/components/apps/ to a backup folder
-	fmt.Println("Copying all files in /home/system/components/apps/ to a backup folder")
-	os.MkdirAll(utils.GetPath(utils.EdgeAppsBackupPath + "temp/"), 0777)
-	system.CopyDir(utils.GetPath(utils.EdgeAppsPath), utils.GetPath(utils.EdgeAppsBackupPath + "temp/"))
-
-	fmt.Println("Removing all files in /home/system/components/apps/")
-	os.RemoveAll(utils.GetPath(utils.EdgeAppsPath))
-
-	// Create directory /home/system/components/apps/
-	fmt.Println("Creating directory /home/system/components/apps/")
-	os.MkdirAll(utils.GetPath(utils.EdgeAppsPath), 0777)
-
-	// ...	This restores up the restic repository
-	cmdArgs := []string{"-r", backup_service + ":" + backup_service_url + backup_repository_name + ":" + backup_repository_location, "restore", "latest", "--target", "/", "--path", backup_repository_location, "--password-file", utils.GetPath(utils.BackupPasswordFileLocation), "--verbose=3"}
-	result := utils.ExecAndStream(backup_repository_location, "restic", cmdArgs)
-
-	taskGetBackupStatus()
-
-	edgeapps.RestartEdgeAppsService()
-
-	utils.WriteOption("BACKUP_IS_WORKING", "0")
-
-	// See if result contains the substring "Fatal:"
-	if strings.Contains(result, "Fatal:") {
-		// Copy all files from backup folder to /home/system/components/apps/
-		os.MkdirAll(utils.GetPath(utils.EdgeAppsPath), 0777)
-		system.CopyDir(utils.GetPath(utils.EdgeAppsBackupPath + "temp/"), utils.GetPath(utils.EdgeAppsPath))
-
-		fmt.Println("Error restoring backup: ")
-		utils.WriteOption("BACKUP_STATUS", "error")
-		utils.WriteOption("BACKUP_ERROR_MESSAGE", result)
-		return "{\"status\": \"error\", \"message\": \"" + result + "\"}"
-	}
-
-	utils.WriteOption("BACKUP_STATUS", "working")
-	taskGetBackupStatus()
-	return "{\"status\": \"ok\"}"
-	
-}
-
-func taskAutoBackup() string {
-	fmt.Println("Executing taskAutoBackup")
-
-	// Get Backup Status
-	backup_status := utils.ReadOption("BACKUP_STATUS")
-	// We only backup is the status is "working"
-	if backup_status == "working" {
-		return taskBackup()
-	} else {
-		fmt.Println("Backup status is not working... skipping")
-		return "{\"status\": \"skipped\"}"		
-	}
-}
-
-func taskGetBackupStatus() string {
-	fmt.Println("Executing taskGetBackupStatus")
-
-	// Load Backup Options
-	backup_service := utils.ReadOption("BACKUP_SERVICE")
-	backup_service_url := utils.ReadOption("BACKUP_SERVICE_URL")
-	backup_repository_name := utils.ReadOption("BACKUP_REPOSITORY_NAME")
-	// backup_repository_password := utils.ReadOption("BACKUP_REPOSITORY_PASSWORD")
-	backup_repository_access_key_id := utils.ReadOption("BACKUP_REPOSITORY_ACCESS_KEY_ID")
-	backup_repository_secret_access_key := utils.ReadOption("BACKUP_REPOSITORY_SECRET_ACCESS_KEY")
-	backup_repository_location := utils.ReadOption("BACKUP_REPOSITORY_LOCATION")
-
-	key_id_name := "AWS_ACCESS_KEY_ID"
-	key_secret_name := "AWS_SECRET_ACCESS_KEY"
-	service_found := false
-
-	switch backup_service {
-		case "s3":
-			service_found = true
-		case "b2":
-			key_id_name = "B2_ACCOUNT_ID"
-			key_secret_name = "B2_ACCOUNT_KEY"
-			service_found = true
-		case "wasabi":
-			service_found = true
-	}
-
-	if !service_found {
-		fmt.Println("Service not found")
-		return "{\"status\": \"error\", \"message\": \"Backup Service not found\"}"
-	}
-
-	fmt.Println("Creating env vars for authentication with backup service")
-	os.Setenv(key_id_name, backup_repository_access_key_id)
-	os.Setenv(key_secret_name, backup_repository_secret_access_key)
-
-	// ...	This gets the restic repository status
-	cmdArgs := []string{"-r", backup_service + ":" + backup_service_url + backup_repository_name + ":" + backup_repository_location, "stats", "--password-file", utils.GetPath(utils.BackupPasswordFileLocation), "--verbose=3"}
-	utils.WriteOption("BACKUP_STATS", utils.ExecAndStream(backup_repository_location, "restic", cmdArgs))
-
-	return "{\"status\": \"ok\"}"
-	
-}
-
 func taskSetupTunnel(args taskSetupTunnelArgs) string {
-	fmt.Println("Executing taskSetupTunnel")
+	// // fmt.Println("Executing taskSetupTunnel")
-	wsPath := utils.GetPath(utils.WsPath)	
 
-	// Stop a the service if it is running
+	cmdargs := []string{"gen", "--name", args.NodeName, "--token", args.BootnodeToken, args.BootnodeAddress + ":8655", "--prefix", args.AssignedAddress}
-	system.StopService("cloudflared")
+	utils.Exec(utils.GetPath("wsPath"), "tinc-boot", cmdargs)
 
-	// Uninstall the service if it is installed
+	cmdargs = []string{"start", "tinc@dnet"}
-	system.RemoveTunnelService()
+	utils.Exec(utils.GetPath("wsPath"), "systemctl", cmdargs)
 
-	fmt.Println("Creating cloudflared folder")
+	cmdargs = []string{"enable", "tinc@dnet"}
-	cmdargs := []string{"/home/system/.cloudflared"}
+	utils.Exec(utils.GetPath("wsPath"), "systemctl", cmdargs)
-	utils.Exec(wsPath, "mkdir", cmdargs)
 
-	cmd := exec.Command("sh", "/home/system/components/edgeboxctl/scripts/cloudflared_login.sh")
+	output := "OK" // Better check / logging of command execution result.
-	stdout, err := cmd.StdoutPipe()
+	return output
-	if err != nil {
-		panic(err)
-	}
-	scanner := bufio.NewScanner(stdout)
-	err = cmd.Start()
-	if err != nil {
-		panic(err)
-	}
-	url := ""
-	for scanner.Scan() {
-		fmt.Println(scanner.Text())
-		text := scanner.Text()
-		if strings.Contains(text, "https://") {
-			url = text
-			fmt.Println("Tunnel setup is requesting auth with URL: " + url)
-			status := "{\"status\": \"waiting\", \"login_link\": \"" + url + "\"}"
-			utils.WriteOption("TUNNEL_STATUS", status)
-			break
-		}
-	}
-	if scanner.Err() != nil {
-		cmd.Process.Kill()
-		cmd.Wait()
-		panic(scanner.Err())
-	}
-
-	go func() {
-		fmt.Println("Running async")
-		cmd.Wait()
-
-		// Keep retrying to read cert.pem file until it is created
-		// When running as a service, the cert is saved to a different folder,
-		// so we check both :)
-		for {
-			_, err := os.Stat("/home/system/.cloudflared/cert.pem")
-			_, err2 := os.Stat("/root/.cloudflared/cert.pem")
-			if err == nil || err2 == nil {
-				fmt.Println("cert.pem file detected")
-				break
-			}
-			time.Sleep(1 * time.Second)
-			fmt.Println("Waiting for cert.pem file to be created")
-		}
-
-		fmt.Println("Tunnel auth setup finished without errors.")
-		status := "{\"status\": \"starting\", \"login_link\": \"" + url + "\"}"
-		utils.WriteOption("TUNNEL_STATUS", status)
-
-		// Remove old tunnel if it exists, and create from scratch
-		system.DeleteTunnel()
-
-		// Create new tunnel (destination config file is param)
-		system.CreateTunnel("/home/system/.cloudflared/config.yml")
-
-		fmt.Println("Creating DNS Routes for @ and *.")
-		cmd = exec.Command("cloudflared", "tunnel", "route", "dns", "-f" ,"edgebox", "*." + args.DomainName)
-		cmd.Start()
-		err = cmd.Wait()
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		cmd = exec.Command("cloudflared", "tunnel", "route", "dns", "-f" ,"edgebox", args.DomainName)
-		cmd.Start()
-		err = cmd.Wait()
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		domainNameInfo := args.DomainName
-		utils.WriteOption("DOMAIN_NAME", domainNameInfo)
-
-		// Install service with given config file
-		system.InstallTunnelService("/home/system/.cloudflared/config.yml")
-
-		// Start the service
-		system.StartService("cloudflared")
-
-		if err != nil {
-			fmt.Println("Tunnel auth setup finished with errors.")
-			status := "{\"status\": \"error\", \"login_link\": \"" + url + "\"}"
-			utils.WriteOption("TUNNEL_STATUS", status)
-			log.Fatal(err)
-		} else {
-			fmt.Println("Tunnel auth setup finished without errors.")
-			status := "{\"status\": \"connected\", \"login_link\": \"" + url + "\", \"domain\": \"" + args.DomainName + "\"}"
-			utils.WriteOption("TUNNEL_STATUS", status)
-		}
-
-		fmt.Println("Finished running async")
-	}()
-
-    return "{\"url\": \"" + url + "\"}"
-}
-
-func taskStartTunnel() string {
-	fmt.Println("Executing taskStartTunnel")
-	system.StartService("cloudflared")
-	domainName := utils.ReadOption("DOMAIN_NAME")
-	status := "{\"status\": \"connected\", \"domain\": \"" + domainName + "\"}"
-	utils.WriteOption("TUNNEL_STATUS", status)
-	return "{\"status\": \"ok\"}"
-}
-
-func taskStopTunnel() string {
-	fmt.Println("Executing taskStopTunnel")
-	system.StopService("cloudflared")
-	domainName := utils.ReadOption("DOMAIN_NAME")
-	status := "{\"status\": \"stopped\", \"domain\": \"" + domainName + "\"}"
-	utils.WriteOption("TUNNEL_STATUS", status)
-	return "{\"status\": \"ok\"}"
-}
-
-func taskDisableTunnel() string {
-	fmt.Println("Executing taskDisableTunnel")
-	system.StopService("cloudflared")
-	system.DeleteTunnel()
-	system.RemoveTunnelService()
-	utils.DeleteOption("DOMAIN_NAME")
-	utils.DeleteOption("TUNNEL_STATUS")
-	return "{\"status\": \"ok\"}"
 }
 
 func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
-	fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
+	// fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
 
 	result := edgeapps.SetEdgeAppInstalled(args.ID)
 	resultJSON, _ := json.Marshal(result)
@@ -904,7 +376,7 @@ func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
 }
 
 func taskRemoveEdgeApp(args taskRemoveEdgeAppArgs) string {
-	fmt.Println("Executing taskRemoveEdgeApp for " + args.ID)
+	// fmt.Println("Executing taskRemoveEdgeApp for " + args.ID)
 
 	// Making sure the application is stopped before setting it as removed.
 	edgeapps.StopEdgeApp(args.ID)
@@ -916,7 +388,7 @@ func taskRemoveEdgeApp(args taskRemoveEdgeAppArgs) string {
 }
 
 func taskStartEdgeApp(args taskStartEdgeAppArgs) string {
-	fmt.Println("Executing taskStartEdgeApp for " + args.ID)
+	// fmt.Println("Executing taskStartEdgeApp for " + args.ID)
 
 	result := edgeapps.RunEdgeApp(args.ID)
 	resultJSON, _ := json.Marshal(result)
@@ -926,7 +398,7 @@ func taskStartEdgeApp(args taskStartEdgeAppArgs) string {
 }
 
 func taskStopEdgeApp(args taskStopEdgeAppArgs) string {
-	fmt.Println("Executing taskStopEdgeApp for " + args.ID)
+	// fmt.Println("Executing taskStopEdgeApp for " + args.ID)
 
 	result := edgeapps.StopEdgeApp(args.ID)
 	resultJSON, _ := json.Marshal(result)
@@ -935,59 +407,8 @@ func taskStopEdgeApp(args taskStopEdgeAppArgs) string {
 	return string(resultJSON)
 }
 
-func taskSetEdgeAppOptions(args taskSetEdgeAppOptionsArgs) string {
-	// Id is the edgeapp id
-	appID := args.ID
-
-
-	// Open the file to write the options,
-	// it is an env file in /home/system/components/apps/<app_id>/edgeapp.env
-
-	// Get the path to the edgeapp.env file
-	edgeappEnvPath := "/home/system/components/apps/" + appID + "/edgeapp.env"
-
-	// If the file does not exist, create it
-	if _, err := os.Stat(edgeappEnvPath); os.IsNotExist(err) {
-		// Create the file
-		_, err := os.Create(edgeappEnvPath)
-		if err != nil {
-			log.Printf("Error creating edgeapp.env file: %s", err)
-		}
-	}
-
-	// It is an env file, so we can use go-dotenv to write the options
-	// Open the file
-	edgeappEnvFile, err := os.OpenFile(edgeappEnvPath, os.O_WRONLY, 0600)
-	if err != nil {
-		log.Printf("Error opening edgeapp.env file: %s", err)
-	}
-
-	// Write the options to the file
-	for _, value := range args.Options {
-		// Write the option to the file
-		_, err := edgeappEnvFile.WriteString(value.Key + "=" + value.Value + "\n")
-		if err != nil {
-			log.Printf("Error writing option to edgeapp.env file: %s", err)
-		}
-	}
-	
-	// Close the file
-	err = edgeappEnvFile.Close()
-	if err != nil {
-		log.Printf("Error closing edgeapp.env file: %s", err)
-	}
-
-	result := edgeapps.GetEdgeAppStatus(appID)
-	resultJSON, _ := json.Marshal(result)
-
-	system.StartWs()
-	taskGetEdgeApps() // This task will imediatelly update the entry in the api database.
-
-	return string(resultJSON)
-}
-
 func taskEnableOnline(args taskEnableOnlineArgs) string {
-	fmt.Println("Executing taskEnableOnline for " + args.ID)
+	// fmt.Println("Executing taskEnableOnline for " + args.ID)
 
 	result := edgeapps.EnableOnline(args.ID, args.InternetURL)
 	resultJSON, _ := json.Marshal(result)
@@ -997,7 +418,7 @@ func taskEnableOnline(args taskEnableOnlineArgs) string {
 }
 
 func taskDisableOnline(args taskDisableOnlineArgs) string {
-	fmt.Println("Executing taskDisableOnline for " + args.ID)
+	// fmt.Println("Executing taskDisableOnline for " + args.ID)
 
 	result := edgeapps.DisableOnline(args.ID)
 	resultJSON, _ := json.Marshal(result)
@@ -1007,7 +428,7 @@ func taskDisableOnline(args taskDisableOnlineArgs) string {
 }
 
 func taskEnablePublicDashboard(args taskEnablePublicDashboardArgs) string {
-	fmt.Println("Enabling taskEnablePublicDashboard")
+	// fmt.Println("Enabling taskEnablePublicDashboard")
 	result := edgeapps.EnablePublicDashboard(args.InternetURL)
 	if result {
 
@@ -1020,7 +441,7 @@ func taskEnablePublicDashboard(args taskEnablePublicDashboardArgs) string {
 }
 
 func taskDisablePublicDashboard() string {
-	fmt.Println("Executing taskDisablePublicDashboard")
+	// fmt.Println("Executing taskDisablePublicDashboard")
 	result := edgeapps.DisablePublicDashboard()
 	utils.WriteOption("PUBLIC_DASHBOARD", "")
 	if result {
@@ -1031,44 +452,15 @@ func taskDisablePublicDashboard() string {
 
 func taskSetReleaseVersion() string {
 
-	fmt.Println("Executing taskSetReleaseVersion")
+	// fmt.Println("Executing taskSetReleaseVersion")
 
 	utils.WriteOption("RELEASE_VERSION", diagnostics.Version)
 
 	return diagnostics.Version
 }
 
-func taskUpdateSystemLoggerServices() string {
-	fmt.Println("Executing taskUpdateSystemLoggerServices")
-	// The input is an array of strings
-	// Each string is a service name to be logged
-	var input []string
-
-	// Get the services
-	edgeAppsList := utils.ReadOption("EDGEAPPS_LIST")
-	var edgeApps []edgeapps.EdgeApp
-	err := json.Unmarshal([]byte(edgeAppsList), &edgeApps)
-	if err != nil {
-		log.Fatalf("failed to unmarshal EDGEAPPS_LIST: %v", err)
-	}
-
-	for _, edgeApp := range edgeApps {
-		for _, service := range edgeApp.Services {
-			input = append(input, service.ID)
-		}
-	}
-
-	input = append(input, "edgeboxctl")
-	input = append(input, "tunnel")
-	
-	// Run the system logger
-	system.UpdateSystemLoggerServices(input)
-
-	return "{\"status\": \"ok\"}"
-}
-
 func taskGetEdgeApps() string {
-	fmt.Println("Executing taskGetEdgeApps")
+	// fmt.Println("Executing taskGetEdgeApps")
 
 	edgeApps := edgeapps.GetEdgeApps()
 	edgeAppsJSON, _ := json.Marshal(edgeApps)
@@ -1078,14 +470,14 @@ func taskGetEdgeApps() string {
 }
 
 func taskGetSystemUptime() string {
-	fmt.Println("Executing taskGetSystemUptime")
+	// fmt.Println("Executing taskGetSystemUptime")
 	uptime := system.GetUptimeInSeconds()
 	utils.WriteOption("SYSTEM_UPTIME", uptime)
 	return uptime
 }
 
 func taskGetStorageDevices() string {
-	fmt.Println("Executing taskGetStorageDevices")
+	// fmt.Println("Executing taskGetStorageDevices")
 
 	devices := storage.GetDevices(diagnostics.GetReleaseVersion())
 	devicesJSON, _ := json.Marshal(devices)
@@ -1096,25 +488,20 @@ func taskGetStorageDevices() string {
 }
 
 func taskGetSystemIP() string {
-	fmt.Println("Executing taskGetStorageDevices")
+	// fmt.Println("Executing taskGetStorageDevices")
 	ip := system.GetIP()
 	utils.WriteOption("IP_ADDRESS", ip)
 	return ip
 }
 
 func taskGetHostname() string {
-	fmt.Println("Executing taskGetHostname")
+	// fmt.Println("Executing taskGetHostname")
 	hostname := system.GetHostname()
 	utils.WriteOption("HOSTNAME", hostname)
 	return hostname
 }
 
 func taskSetupCloudOptions() {
-	fmt.Println("Executing taskSetupCloudOptions")
+	// fmt.Println("Executing taskSetupCloudOptions")
 	system.SetupCloudOptions()
 }
-
-func taskStartWs() {
-	fmt.Println("Executing taskStartWs")
-	system.StartWs()
-}

internal/utils/utils.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"database/sql"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -12,11 +13,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/TylerBrock/colorjson"
 	"github.com/joho/godotenv"
 )
 
 // ExecAndStream : Runs a terminal command, but streams progress instead of outputting. Ideal for long lived process that need to be logged.
-func ExecAndStream(path string, command string, args []string) string {
+func ExecAndStream(path string, command string, args []string) {
 
 	cmd := exec.Command(command, args...)
 
@@ -27,17 +29,13 @@ func ExecAndStream(path string, command string, args []string) string {
 
 	err := cmd.Run()
 
-	outStr, errStr := string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())
-
-	returnVal := outStr
 	if err != nil {
 		fmt.Printf("cmd.Run() failed with %s\n", err)
-		returnVal = errStr
 	}
 
+	outStr, errStr := string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())
 	fmt.Printf("\nout:\n%s\nerr:\n%s\n", outStr, errStr)
 
-	return returnVal
 }
 
 // Exec : Runs a terminal Command, catches and logs errors, returns the result.
@@ -85,7 +83,7 @@ func DeleteEmptySlices(s []string) []string {
 func GetSQLiteDbConnectionDetails() string {
 
 	var apiEnv map[string]string
-	apiEnv, err := godotenv.Read(GetPath(ApiEnvFileLocation))
+	apiEnv, err := godotenv.Read(GetPath("apiEnvFileLocation"))
 
 	if err != nil {
 		log.Fatal("Error loading .env file")
@@ -95,8 +93,8 @@ func GetSQLiteDbConnectionDetails() string {
 
 }
 
-// GetSQLiteFormattedDateTime: Given a Time, Returns a string that is formatted ready to be inserted into an SQLite Datetime field using sql.Prepare.
+// GetFormattedDateTime: Given a Time, Returns a string that is formatted to be passed around the application, including correctly inserting SQLite Datetime field using sql.Prepare.
-func GetSQLiteFormattedDateTime(t time.Time) string {
+func GetFormattedDateTime(t time.Time) string {
 	// This date is used to indicate the layout.
 	const datetimeLayout = "2006-01-02 15:04:05"
 	formatedDatetime := t.Format(datetimeLayout)
@@ -104,16 +102,6 @@ func GetSQLiteFormattedDateTime(t time.Time) string {
 	return formatedDatetime
 }
 
-const BackupPasswordFileLocation string = "backupPasswordFileLocation"
-const CloudEnvFileLocation string = "cloudEnvFileLocation"
-const ApiEnvFileLocation string = "apiEnvFileLocation"
-const ApiPath string = "apiPath"
-const EdgeAppsPath string = "edgeAppsPath"
-const EdgeAppsBackupPath string = "edgeAppsBackupPath"
-const WsPath string = "wsPath"
-const LoggerPath string = "loggerPath"
-
-
 // GetPath : Returns either the hardcoded path, or a overwritten value via .env file at project root. Register paths here for seamless working code between dev and prod environments ;)
 func GetPath(pathKey string) string {
 
@@ -127,15 +115,15 @@ func GetPath(pathKey string) string {
 	}
 
 	switch pathKey {
-	case CloudEnvFileLocation:
+	case "cloudEnvFileLocation":
 
 		if env["CLOUD_ENV_FILE_LOCATION"] != "" {
 			targetPath = env["CLOUD_ENV_FILE_LOCATION"]
 		} else {
-			targetPath = "/home/system/components/api/cloud.env"
+			targetPath = "/home/system/components/edgeboxctl/cloud.env"
 		}
 
-	case ApiEnvFileLocation:
+	case "apiEnvFileLocation":
 
 		if env["API_ENV_FILE_LOCATION"] != "" {
 			targetPath = env["API_ENV_FILE_LOCATION"]
@@ -143,15 +131,15 @@ func GetPath(pathKey string) string {
 			targetPath = "/home/system/components/api/edgebox.env"
 		}
 
-	case ApiPath:
+	case "apiPath":
 
 		if env["API_PATH"] != "" {
-			targetPath = env["API_PATH"]
+			targetPath = env["APT_PATH"]
 		} else {
 			targetPath = "/home/system/components/api/"
 		}
 
-	case EdgeAppsPath:
+	case "edgeAppsPath":
 
 		if env["EDGEAPPS_PATH"] != "" {
 			targetPath = env["EDGEAPPS_PATH"]
@@ -159,14 +147,7 @@ func GetPath(pathKey string) string {
 			targetPath = "/home/system/components/apps/"
 		}
 
-	case EdgeAppsBackupPath:
+	case "wsPath":
-		if env["EDGEAPPS_BACKUP_PATH"] != "" {
-			targetPath = env["EDGEAPPS_BACKUP_PATH"]
-		} else {
-			targetPath = "/home/system/components/backups/"
-		}
-
-	case WsPath:
 
 		if env["WS_PATH"] != "" {
 			targetPath = env["WS_PATH"]
@@ -174,21 +155,6 @@ func GetPath(pathKey string) string {
 			targetPath = "/home/system/components/ws/"
 		}
 
-	case LoggerPath:
-		if env["LOGGER_PATH"] != "" {
-			targetPath = env["LOGGER_PATH"]
-		} else {
-			targetPath = "/home/system/components/logger/"
-		}
-
-	case BackupPasswordFileLocation:
-
-		if env["BACKUP_PASSWORD_FILE_LOCATION"] != "" {
-			targetPath = env["BACKUP_PASSWORD_FILE_LOCATION"]
-		} else {
-			targetPath = "/home/system/components/backups/pw.txt"
-		}
-
 	default:
 
 		log.Printf("path_key %s nonexistant in GetPath().\n", pathKey)
@@ -213,7 +179,7 @@ func WriteOption(optionKey string, optionValue string) {
 		log.Fatal(err.Error())
 	}
 
-	formatedDatetime := GetSQLiteFormattedDateTime(time.Now())
+	formatedDatetime := GetFormattedDateTime(time.Now())
 
 	_, err = statement.Exec(optionKey, optionValue, formatedDatetime, formatedDatetime) // Execute SQL Statement
 	if err != nil {
@@ -223,46 +189,20 @@ func WriteOption(optionKey string, optionValue string) {
 	db.Close()
 }
 
-// ReadOption : Reads a key value pair option from the api shared database
+// IsSystemReady : Checks readiness of the service to execute commands (Only after "edgebox --build" is ran at least once via SSH, or if built for distribution)
-func ReadOption(optionKey string) string {
+func IsSystemReady() bool {
-	
+	_, err := os.Stat(GetPath("wsPath") + ".ready")
-	db, err := sql.Open("sqlite3", GetSQLiteDbConnectionDetails())
+	return !os.IsNotExist(err)
-
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	var optionValue string
-
-	err = db.QueryRow("SELECT value FROM option WHERE name = ?", optionKey).Scan(&optionValue)
-
-	if err != nil {
-		log.Println(err.Error())
-	}
-
-	db.Close()
-
-	return optionValue
 }
 
-// DeleteOption : Deletes a key value pair option from the api shared database
+// IsDatabaseReady : Checks is it can successfully connect to the task queue db
-func DeleteOption(optionKey string) {
+func IsDatabaseReady() bool {
-	
+	return false
-	db, err := sql.Open("sqlite3", GetSQLiteDbConnectionDetails())
+}
-
+
-	if err != nil {
+func ColorJsonString(jsonString string) string {
-		log.Fatal(err.Error())
+	var obj map[string]interface{}
-	}
+	json.Unmarshal([]byte(jsonString), &obj)
-
+	resultJSON, _ := colorjson.Marshal(obj)
-	statement, err := db.Prepare("DELETE FROM option WHERE name = ?;") // Prepare SQL Statement
+	return string(resultJSON)
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	_, err = statement.Exec(optionKey) // Execute SQL Statement
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	db.Close()
 }

internal/utils/utils_test.go

@@ -89,16 +89,17 @@ func TestGetPath(t *testing.T) {
 		t.Fail()
 	}
 
-	result = GetPath(WsPath)
+	validPathKey := "wsPath"
+	result = GetPath(validPathKey)
 	if result != "/home/system/components/ws/" {
 		t.Log("Expected /home/system/components/ws/ but got", result)
 		t.Fail()
 	}
 }
 
-func TestGetSQLiteFormattedDateTime(t *testing.T) {
+func TestGetFormattedDateTime(t *testing.T) {
 	datetime := time.Date(2021, time.Month(1), 01, 1, 30, 15, 0, time.UTC)
-	result := GetSQLiteFormattedDateTime(datetime)
+	result := GetFormattedDateTime(datetime)
 
 	if result != "2021-01-01 01:30:15" {
 		t.Log("Expected 2021-01-01 01:30:15 but got ", result)

scripts/cloudflared_login.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Starting script login"
-cloudflared tunnel login 2>&1 | tee /home/system/components/edgeboxctl/scripts/output.log &
-echo "sleeping 5 seconds"
-sleep 5

scripts/cloudflared_tunnel_create.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Starting script create"
-# script -q -c "cloudflared tunnel login 2>&1 | tee /app/output.log" &
-cloudflared tunnel create edgebox 2>&1 | tee /home/system/components/edgeboxctl/scripts/output.log
-echo "sleeping 5 seconds"
-sleep 5

scripts/cloudflared_tunnel_delete.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Starting script delete"
-TUNNEL_ORIGIN_CERT=/home/system/.cloudflared/cert.pem
-cloudflared tunnel delete edgebox 2>&1 | tee /home/system/components/edgeboxctl/scripts/output.log &
-echo "sleeping 5 seconds"
-sleep 5