Merge f0bfc92295 into 8bf26a334c

.github/workflows/go.yml

@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v3
       with:
-        go-version: '1.20.2'
+        go-version: ^1.15
     - name: Check out code
       uses: actions/checkout@v3
     - name: Build
       run: make build
     - name: Test
       run: make test-with-coverage
-    # - uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v1
-    #   with:
+      with:
-    #     token: ${{ secrets.CODECOV_TOKEN }}
+        token: ${{ secrets.CODECOV_TOKEN }}
-    #     files: coverage.out
+        files: coverage.out

Dockerfile

@@ -1,9 +1,11 @@
-FROM golang:1.20.2
+FROM golang:latest
 
 WORKDIR /app
 
 COPY ./ /app
 
-RUN go install github.com/githubnemo/CompileDaemon@latest
+RUN go mod download
 
-ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl-$(go env GOOS)-$(go env GOARCH)
+RUN go get github.com/githubnemo/CompileDaemon
+
+ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl

Makefile

@@ -1,18 +1,25 @@
-.DEFAULT_GOAL := build
+PROJECT?=github.com/edgebox-iot/edgeboxctl
 
-PROJECT ?= github.com/edgebox-iot/edgeboxctl
 RELEASE ?= dev
 COMMIT := $(shell git rev-parse --short HEAD)
 BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S')
 BUILD_DIR = bin
-GOOS := $(shell go env GOOS)
-GOARCH := $(shell go env GOARCH)
 
-
+build-all:
-build-all: clean
 	GOOS=linux GOARCH=amd64 make build
 	GOOS=linux GOARCH=arm make build
-	GOOS=linux GOARCH=arm64 make build
+
+build-prod:
+	GOOS=linux GOARCH=arm RELEASE=prod make build
+
+build-cloud:
+	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}"
@@ -21,6 +28,7 @@ build:
 		-X ${PROJECT}/internal/diagnostics.Commit=${COMMIT} \
 		-X ${PROJECT}/internal/diagnostics.BuildDate=${BUILD_DATE}" \
 		-o bin/edgeboxctl-${GOOS}-${GOARCH} ${PROJECT}/cmd/edgeboxctl
+	cp ./bin/edgeboxctl-${GOOS}-${GOARCH} ./bin/edgeboxctl
 
 clean:
 	rm -rf ${BUILD_DIR}
@@ -33,16 +41,18 @@ test-with-coverage:
 	go test -tags=unit -timeout=600s -v ./... -coverprofile=coverage.out
 
 install:
-	sudo systemctl stop edgeboxctl || true
+	sudo systemctl stop edgeboxctl
-	sudo rm -rf /usr/local/bin/edgeboxctl /usr/local/sbin/edgeboctl /lib/systemd/system/edgeboxctl.service
+	sudo rm -rf /usr/local/bin/edgeboxctl /lib/systemd/system/edgeboxctl.service
-	sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /usr/local/bin/edgeboxctl
+	sudo cp ./bin/edgeboxctl /usr/local/bin/edgeboxctl
-	sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /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"
 
-build-install: build install
+install-prod: build-prod install
+install-cloud: build-cloud install
+install-arm64: build-arm64 install
+install-armhf: build-armhf install
 
 start:
 	systemctl start edgeboxctl
@@ -52,3 +62,4 @@ stop:
 
 log: start
 	journalctl -fu edgeboxctl
+

README.md

@@ -8,7 +8,7 @@
   <h3 align="center">Edgebox Control Module</h3>
 
   <p align="center">
-    A System Control module written in Go. Its responsibility is to configure dependencies and perform system tasks, automatically on a schedule, or on demand.
+    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 />
     <br />
     <a href="https://github.com/github_username/edgeboxctl/issues">Report Bug</a>
@@ -38,6 +38,8 @@
 <!-- ABOUT THE PROJECT -->
 ## About The Project
 
+[![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.
 
 
@@ -56,15 +58,18 @@ To get a local copy up and running follow these simple steps.
 
 ### Prerequisites
 
-If you're running for development purposes, a docker container suffices, so make sure you have:
+If you're installing this to run natively in the system, you better be doing it inside of the [Development Virtual Machine](https://github.com/edgebox-iot/devm). This software can do destructive action in the system is is running. You've been warned.
 
-* docker
+If you're running for development purposes, a Docker container suffices, so make sure you have:
-* docker compose
+* Docker
+* Docker Compose
+```sh
+sudo apt-get install docker docker-compose
+```
 
 Check the following links for more info on [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/).
 
-Aditionally, `edgeboxctl` needs the following bash commands available wherever it runs:
+Aditionally, edgeboxctl needs the following bash commands available wherever it runs:
-
 * `arm-linux-gnueabi-gcc` (`sudo apt-get install gcc-arm*`)
 * `sh`
 * `rm`
@@ -116,4 +121,4 @@ Contributions are what make the open source community such an amazing place to b
 <!-- LICENSE -->
 ## License
 
-Distributed under the Elastic License 2.0. See `LICENSE` for more information.
+Distributed under the MIT License. See `LICENSE` for more information.

codecov.yml

@@ -1,4 +1,3 @@
-codecov:
-  require_ci_to_pass: no
-
 comment: false
+github_checks:
+  annotations: false

internal/diagnostics/diagnostics.go

@@ -1,5 +1,18 @@
 package diagnostics
 
+type ReleaseVersion string
+
 var Version string
 var Commit string
 var BuildDate string
+
+const (
+	DEV_VERSION   ReleaseVersion = "dev"
+	PROD_VERSION  ReleaseVersion = "prod"
+	CLOUD_VERSION ReleaseVersion = "cloud"
+	OTHER_VERSION ReleaseVersion = "other"
+)
+
+func GetReleaseVersion() ReleaseVersion {
+	return ReleaseVersion(Version)
+}

internal/edgeapps/edgeapps.go

@@ -23,9 +23,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"`
-	Login              EdgeAppLogin	 	`json:"login"`
 }
 
 // MaybeEdgeApp : Boolean flag for validation of edgeapp existance
@@ -46,29 +43,9 @@ 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"`
-}
-
-type EdgeAppLogin struct {
-	Enabled  bool   `json:"enabled"`
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
 const configFilename = "/edgebox-compose.yml"
 const envFilename = "/edgebox.env"
-const optionsTemplateFilename = "/edgeapp.template.env"
-const optionsEnvFilename = "/edgeapp.env"
-const authEnvFilename = "/auth.env"
 const runnableFilename = "/.run"
-const appdataFoldername = "/appdata"
 const myEdgeAppServiceEnvFilename = "/myedgeapp.env"
 const defaultContainerOperationSleepTime time.Duration = time.Second * 10
 
@@ -86,7 +63,6 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 
 		edgeAppName := ID
 		edgeAppDescription := ""
-		edgeAppOptions := []EdgeAppOption{}
 
 		edgeAppEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + envFilename)
 
@@ -101,103 +77,6 @@ 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 := ""
 
@@ -211,21 +90,6 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 			}
 		}
 
-		edgeAppBasicAuthEnabled := false
-		edgeAppBasicAuthUsername := ""
-		edgeAppBasicAuthPassword := ""
-
-		edgeAppAuthEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + authEnvFilename)
-		if err != nil {
-			log.Println("No auth.env file found. Login status is disabled.")
-		} else {
-			if edgeAppAuthEnv["USERNAME"] != "" && edgeAppAuthEnv["PASSWORD"] != "" {
-				edgeAppBasicAuthEnabled = true
-				edgeAppBasicAuthUsername = edgeAppAuthEnv["USERNAME"]
-				edgeAppBasicAuthPassword = edgeAppAuthEnv["PASSWORD"]
-			}
-		}
-
 		result = MaybeEdgeApp{
 			EdgeApp: EdgeApp{
 				ID:                 ID,
@@ -234,12 +98,8 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 				Status:             GetEdgeAppStatus(ID),
 				Services:           GetEdgeAppServices(ID),
 				InternetAccessible: edgeAppInternetAccessible,
-				NetworkURL:         ID + "." + system.GetHostname() + ".local",
+				NetworkURL:         ID + system.GetHostname() + ".local",
 				InternetURL:        edgeAppInternetURL,
-				Options: 		    edgeAppOptions,
-				NeedsConfig:        needsConfig,
-				Login:				EdgeAppLogin{edgeAppBasicAuthEnabled, edgeAppBasicAuthUsername, edgeAppBasicAuthPassword},
-				
 			},
 			Valid: true,
 		}
@@ -294,40 +154,11 @@ func SetEdgeAppInstalled(ID string) bool {
 
 func SetEdgeAppNotInstalled(ID string) bool {
 
-	// Stop the app first
-	StopEdgeApp(ID)
-
-	// Now remove any files
 	result := true
-	
 	err := os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
 	if err != nil {
 		result = false
-		log.Println(err)
+		log.Fatal(err)
-	}
-
-	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + authEnvFilename)
-	if err != nil {
-		result = false
-		log.Println(err)
-	}
-
-	err = os.RemoveAll(utils.GetPath(utils.EdgeAppsPath) + ID + appdataFoldername)
-	if err != nil {
-		result = false
-		log.Println(err)
-	}
-
-	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + myEdgeAppServiceEnvFilename)
-	if err != nil {
-		result = false
-		log.Println(err)
-	}
-
-	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + optionsEnvFilename)
-	if err != nil {
-		result = false
-		log.Println(err)
 	}
 
 	buildFrameworkContainers()

internal/storage/storage.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 	"github.com/shirou/gopsutil/disk"
 )
@@ -74,9 +75,20 @@ const (
 	DISK_TYPE_VDA   DeviceIdentifier = "vda"
 )
 
+func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
+	switch release_version {
+	case diagnostics.CLOUD_VERSION:
+		return DISK_TYPE_VDA
+	case diagnostics.PROD_VERSION:
+		return DISK_TYPE_MCBLK
+	}
+
+	return DISK_TYPE_SDA
+}
+
+// GetDevices : Returns a list of all available sotrage devices in structs filled with information
+func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 
-// GetDevices : Returns a list of all available storage devices in structs filled with information
-func GetDevices() []Device {
 	var devices []Device
 
 	cmdArgs := []string{"--raw", "--bytes", "--noheadings"}
@@ -88,6 +100,8 @@ func GetDevices() []Device {
 	firstDevice := true
 	currentDeviceInUseFlag := false
 
+	mainDiskID := GetDeviceIdentifier(release_version)
+
 	for scanner.Scan() {
 		// 1 Device is represented here. Extract words in order for filling a Device struct
 		// Example deviceRawInfo: "mmcblk0 179:0 0 29.7G 0 disk"
@@ -139,9 +153,14 @@ func GetDevices() []Device {
 				Status:     DeviceStatus{ID: 1, Description: "healthy"},
 			}
 
+			if device.ID == mainDiskID {
+				device.MainDevice = true
+			}
+
 			currentDevice = device
 
 		} else if isPartition {
+
 			mountpoint := ""
 			if len(deviceRawInfo) >= 7 {
 				mountpoint = deviceRawInfo[6]

internal/storage/storage_test.go

@@ -7,7 +7,14 @@ import (
 )
 
 func TestGetDevices(t *testing.T) {
-	assertGetDevices(GetDevices(), t)
+
+	t.Log("Testing with release version dev")
+	assertGetDevices(GetDevices("dev"), t)
+	t.Log("Testing with release version prod")
+	assertGetDevices(GetDevices("prod"), t)
+	t.Log("Testing with release version cloud")
+	assertGetDevices(GetDevices("cloud"), t)
+
 }
 
 func assertGetDevices(devices []Device, t *testing.T) {

internal/system/system.go

@@ -82,7 +82,6 @@ func SetupCloudOptions() {
 
 	if err != nil {
 		fmt.Println("Error loading .env file for cloud version setup")
-		return
 	}
 
 	if cloudEnv["NAME"] != "" {
@@ -93,22 +92,6 @@ 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"])
 	}
@@ -117,37 +100,6 @@ func SetupCloudOptions() {
 	utils.Exec("/", "rm", []string{cloudEnvFileLocationPath})
 }
 
-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)

internal/tasks/tasks.go

@@ -33,17 +33,6 @@ 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 TaskBasicAuth struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
 type taskSetupTunnelArgs struct {
 	DomainName string `json:"domain_name"`
 }
@@ -64,21 +53,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 taskSetEdgeAppBasicAuthArgs struct {
-	ID string `json:"id"`
-	Login TaskBasicAuth `json:"login"`
-}
-
-type taskRemoveEdgeAppBasicAuthArgs struct {
-	ID string `json:"id"`
-}
-
 type taskEnableOnlineArgs struct {
 	ID          string `json:"id"`
 	InternetURL string `json:"internet_url"`
@@ -164,208 +138,176 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	log.Println("Task: " + task.Task)
+	if diagnostics.GetReleaseVersion() == diagnostics.DEV_VERSION {
-	log.Println("Args: " + task.Args.String)
+		log.Printf("Dev environemnt. Not executing tasks.")
-	switch task.Task {
+	} else {
-	case "setup_backups":
+		log.Println("Task: " + task.Task)
+		log.Println("Args: " + task.Args.String)
+		switch task.Task {
+		case "setup_backups":
 
-		log.Println("Setting up Backups Destination...")
+			log.Println("Setting up Backups Destination...")
-		var args taskSetupBackupsArgs
+			var args taskSetupBackupsArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
+			err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
+			if err != nil {
-			log.Println("Error reading arguments of setup_backups task.")
+				log.Println("Error reading arguments of setup_backups task.")
-		} else {
+			} else {
-			taskResult := taskSetupBackups(args)
+				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 "start_backup":
+		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}
 
-		log.Println("Backing up Edgebox...")
+		case "setup_tunnel":
-		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("Setting up Cloudflare Tunnel...")
-		log.Println("Attempting to Restore Last Backup to Edgebox")
+			var args taskSetupTunnelArgs
-		taskResult := taskRestoreBackup()
+			err := json.Unmarshal([]byte(task.Args.String), &args)
-		taskResultBool := true
+			if err != nil {
-		// Check if returned taskResult string contains "error"
+				log.Printf("Error reading arguments of setup_tunnel task: %s", err)
-		if strings.Contains(taskResult, "error") {
+				status := "{\"status\": \"error\", \"message\": \"The Domain Name you are going to Authorize must be provided beforehand! Please insert a domain name and try again.\"}"
-			taskResultBool = false
+				utils.WriteOption("TUNNEL_STATUS", status)
-		}
+			} else {
-		task.Result = sql.NullString{String: taskResult, Valid: taskResultBool}
+				taskResult := taskSetupTunnel(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
 
-	case "setup_tunnel":
+		case "start_tunnel":
 
-		log.Println("Setting up Cloudflare Tunnel...")
+			log.Println("Starting Cloudflare Tunnel...")
-		var args taskSetupTunnelArgs
+			taskResult := taskStartTunnel()
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of setup_tunnel 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 "stop_tunnel":
 
-		log.Println("Starting Cloudflare Tunnel...")
+			log.Println("Stopping Cloudflare Tunnel...")
-		taskResult := taskStartTunnel()
+			taskResult := taskStopTunnel()
-		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":
-
-		log.Println("Installing EdgeApp...")
-		var args taskInstallEdgeAppArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of install_edgeapp task: %s", err)
-		} else {
-			taskResult := taskInstallEdgeApp(args)
 			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
 		
-	case "remove_edgeapp":
+		case "disable_tunnel":
 
-		log.Println("Removing EdgeApp...")
+			log.Println("Disabling Cloudflare Tunnel...")
-		var args taskRemoveEdgeAppArgs
+			taskResult := taskDisableTunnel()
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of remove_edgeapp task: %s", err)
-		} else {
-			taskResult := taskRemoveEdgeApp(args)
 			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
 
-	case "start_edgeapp":
+		case "install_edgeapp":
 
-		log.Println("Starting EdgeApp...")
+			log.Println("Installing EdgeApp...")
-		var args taskStartEdgeAppArgs
+			var args taskInstallEdgeAppArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
+			err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
+			if err != nil {
-			log.Printf("Error reading arguments of start_edgeapp task: %s", err)
+				log.Printf("Error reading arguments of install_edgeapp task: %s", err)
-		} else {
+			} else {
-			taskResult := taskStartEdgeApp(args)
+				taskResult := taskInstallEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "remove_edgeapp":
+
+			log.Println("Removing EdgeApp...")
+			var args taskRemoveEdgeAppArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of remove_edgeapp task: %s", err)
+			} else {
+				taskResult := taskRemoveEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "start_edgeapp":
+
+			log.Println("Starting EdgeApp...")
+			var args taskStartEdgeAppArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of start_edgeapp task: %s", err)
+			} else {
+				taskResult := taskStartEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "stop_edgeapp":
+
+			log.Println("Stopping EdgeApp...")
+			var args taskStopEdgeAppArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of stop_edgeapp task: %s", err)
+			} else {
+				taskResult := taskStopEdgeApp(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "enable_online":
+
+			log.Println("Enabling online access to EdgeApp...")
+			var args taskEnableOnlineArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of enable_online task: %s", err)
+			} else {
+				taskResult := taskEnableOnline(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "disable_online":
+
+			log.Println("Disabling online access to EdgeApp...")
+			var args taskDisableOnlineArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of enable_online task: %s", err)
+			} else {
+				taskResult := taskDisableOnline(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "enable_public_dashboard":
+
+			log.Println("Enabling online access to Dashboard...")
+			var args taskEnablePublicDashboardArgs
+			err := json.Unmarshal([]byte(task.Args.String), &args)
+			if err != nil {
+				log.Printf("Error reading arguments of enable_public_dashboard task: %s", err)
+			} else {
+				taskResult := taskEnablePublicDashboard(args)
+				task.Result = sql.NullString{String: taskResult, Valid: true}
+			}
+
+		case "disable_public_dashboard":
+
+			log.Println("Disabling online access to Dashboard...")
+			taskResult := taskDisablePublicDashboard()
 			task.Result = sql.NullString{String: taskResult, Valid: true}
+
 		}
 
-	case "stop_edgeapp":
-
-		log.Println("Stopping EdgeApp...")
-		var args taskStopEdgeAppArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of stop_edgeapp task: %s", err)
-		} else {
-			taskResult := taskStopEdgeApp(args)
-			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 "set_edgeapp_basic_auth":
-
-		log.Println("Settig EdgeApp Basic Authentication...")
-		var args taskSetEdgeAppBasicAuthArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of set_edgeapp_basic_auth task: %s", err)
-		} else {
-			taskResult := taskSetEdgeAppBasicAuth(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "remove_edgeapp_basic_auth":
-
-		log.Println("Removing EdgeApp Basic Authentication...")
-		var args taskRemoveEdgeAppBasicAuthArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of remove_edgeapp_basic_auth task: %s", err)
-		} else {
-			taskResult := taskRemoveEdgeAppBasicAuth(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "enable_online":
-
-		log.Println("Enabling online access to EdgeApp...")
-		var args taskEnableOnlineArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of enable_online task: %s", err)
-		} else {
-			taskResult := taskEnableOnline(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "disable_online":
-
-		log.Println("Disabling online access to EdgeApp...")
-		var args taskDisableOnlineArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of enable_online task: %s", err)
-		} else {
-			taskResult := taskDisableOnline(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "enable_public_dashboard":
-
-		log.Println("Enabling online access to Dashboard...")
-		var args taskEnablePublicDashboardArgs
-		err := json.Unmarshal([]byte(task.Args.String), &args)
-		if err != nil {
-			log.Printf("Error reading arguments of enable_public_dashboard task: %s", err)
-		} else {
-			taskResult := taskEnablePublicDashboard(args)
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-		}
-
-	case "disable_public_dashboard":
-
-		log.Println("Disabling online access to Dashboard...")
-		taskResult := taskDisablePublicDashboard()
-		task.Result = sql.NullString{String: taskResult, Valid: true}
 	}
 
-
 	statement, err = db.Prepare("Update task SET status = ?, result = ?, updated = ? WHERE ID = ?;") // Prepare SQL Statement
 	if err != nil {
 		log.Fatal(err.Error())
@@ -422,18 +364,18 @@ func ExecuteSchedules(tick int) {
 		// 	})
 		// }
 
-
+		if diagnostics.GetReleaseVersion() == diagnostics.CLOUD_VERSION {
-		log.Println("Setting up cloud version options (name, email, api token)")
+			log.Println("Setting up cloud version options (name, email, api token)")
-		taskSetupCloudOptions()
+			taskSetupCloudOptions()
+		}
 
 		// Executing on startup (first tick). Schedules run before tasks in the SystemIterator
 		uptime := taskGetSystemUptime()
 		log.Println("Uptime is " + uptime + " seconds (" + system.GetUptimeFormatted() + ")")
 
 		log.Println(taskGetStorageDevices())
-		taskStartWs()
 		log.Println(taskGetEdgeApps())
-		taskUpdateSystemLoggerServices()
+
 	}
 
 	if tick%5 == 0 {
@@ -445,7 +387,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")
 
@@ -482,12 +423,6 @@ func ExecuteSchedules(tick int) {
 		// 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...)
 
 }
@@ -967,128 +902,6 @@ 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 taskSetEdgeAppBasicAuth(args taskSetEdgeAppBasicAuthArgs) 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>/auth.env
-
-	// Get the path to the auth.env file
-	edgeappAuthEnvPath := "/home/system/components/apps/" + appID + "/auth.env"
-
-	// If the file does not exist, create it
-	if _, err := os.Stat(edgeappAuthEnvPath); os.IsNotExist(err) {
-		// Create the file
-		_, err := os.Create(edgeappAuthEnvPath)
-		if err != nil {
-			log.Printf("Error creating auth.env file: %s", err)
-		}
-	}
-
-	// It is an env file, so we can use go-dotenv to write the options
-	// Open the file
-	edgeappAuthEnvFile, err := os.OpenFile(edgeappAuthEnvPath, os.O_WRONLY, 0600)
-	if err != nil {
-		log.Printf("Error opening auth.env file: %s", err)
-	}
-
-	// Write the login values to the file
-	_, err = edgeappAuthEnvFile.WriteString("USERNAME=" + args.Login.Username + "\n" + "PASSWORD=" + args.Login.Password + "\n")
-	if err != nil {
-		log.Printf("Error writing credentials to auth.env file: %s", err)
-	}
-	
-	// Close the file
-	err = edgeappAuthEnvFile.Close()
-	if err != nil {
-		log.Printf("Error closing auth.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 taskRemoveEdgeAppBasicAuth(args taskRemoveEdgeAppBasicAuthArgs) string {
-	// Id is the edgeapp id
-	appID := args.ID
-
-	// Get the path to the auth.env file
-	edgeappAuthEnvFile := "/auth.env"
-
-	fmt.Println("Removing auth.env file" + edgeappAuthEnvFile)
-
-	err := os.Remove(utils.GetPath(utils.EdgeAppsPath) + args.ID + edgeappAuthEnvFile)
-	if err != nil {
-		log.Fatal(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)
 
@@ -1141,35 +954,6 @@ func taskSetReleaseVersion() string {
 	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")
 
@@ -1190,7 +974,7 @@ func taskGetSystemUptime() string {
 func taskGetStorageDevices() string {
 	fmt.Println("Executing taskGetStorageDevices")
 
-	devices := storage.GetDevices()
+	devices := storage.GetDevices(diagnostics.GetReleaseVersion())
 	devicesJSON, _ := json.Marshal(devices)
 
 	utils.WriteOption("STORAGE_DEVICES_LIST", string(devicesJSON))
@@ -1216,8 +1000,3 @@ func taskSetupCloudOptions() {
 	fmt.Println("Executing taskSetupCloudOptions")
 	system.SetupCloudOptions()
 }
-
-func taskStartWs() {
-	fmt.Println("Executing taskStartWs")
-	system.StartWs()
-}

internal/utils/utils.go

@@ -111,8 +111,6 @@ 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 {
@@ -132,7 +130,7 @@ func GetPath(pathKey string) string {
 		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:
@@ -174,13 +172,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"] != "" {