Fix tests

* Tidy repo

* Tidy

* Fix up

* Setup default target

.github/workflows/go.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: ^1.15
+        go-version: '1.20.2'
     - name: Check out code
       uses: actions/checkout@v3
     - name: Build

Dockerfile

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

Makefile

@@ -1,29 +1,18 @@
-PROJECT?=github.com/edgebox-iot/edgeboxctl
+.DEFAULT_GOAL := build
 
+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
-
-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-amd64:
-	GOOS=linux GOARCH=amd64 RELEASE=prod make build
-
+	GOOS=linux GOARCH=arm64 make build
 
 build:
 	@echo "Building ${GOOS}-${GOARCH}"
@@ -32,7 +21,6 @@ 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}
@@ -47,18 +35,14 @@ test-with-coverage:
 install:
 	sudo systemctl stop edgeboxctl || true
 	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 ./bin/edgeboxctl-${GOOS}-${GOARCH} /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"
 
-install-prod: build-prod install
-install-cloud: build-cloud install
-install-arm64: build-arm64 install
-install-armhf: build-armhf install
-install-amd64: build-amd64 install
+build-install: build install
 
 start:
 	systemctl start edgeboxctl
@@ -68,4 +52,3 @@ 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 resonsability is to configure dependencies and perform system tasks, automatically in a schedule, or by command.
+    A System Control module written in Go. Its responsibility is to configure dependencies and perform system tasks, automatically on a schedule, or on demand.
     <br />
     <br />
     <a href="https://github.com/github_username/edgeboxctl/issues">Report Bug</a>
@@ -38,8 +38,6 @@
 <!-- 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.
 
 
@@ -58,18 +56,15 @@ To get a local copy up and running follow these simple steps.
 
 ### Prerequisites
 
-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.
+If you're running for development purposes, a docker container suffices, so make sure you have:
 
-If you're running for development purposes, a Docker container suffices, so make sure you have:
-* Docker
-* Docker Compose
-```sh
-sudo apt-get install docker docker-compose
-```
+* 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`
@@ -121,4 +116,4 @@ Contributions are what make the open source community such an amazing place to b
 <!-- LICENSE -->
 ## License
 
-Distributed under the MIT License. See `LICENSE` for more information.
+Distributed under the Elastic License 2.0. See `LICENSE` for more information.

internal/diagnostics/diagnostics.go

@@ -1,18 +1,5 @@
 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/storage/storage.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 	"github.com/shirou/gopsutil/disk"
 )
@@ -75,20 +74,9 @@ 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"}
@@ -100,8 +88,6 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []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"
@@ -153,14 +139,9 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []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,14 +7,7 @@ import (
 )
 
 func TestGetDevices(t *testing.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)
-
+	assertGetDevices(GetDevices(), t)
 }
 
 func assertGetDevices(devices []Device, t *testing.T) {

internal/system/system.go

@@ -82,6 +82,7 @@ func SetupCloudOptions() {
 
 	if err != nil {
 		fmt.Println("Error loading .env file for cloud version setup")
+		return
 	}
 
 	if cloudEnv["NAME"] != "" {

internal/tasks/tasks.go

@@ -164,213 +164,208 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	if diagnostics.GetReleaseVersion() == diagnostics.DEV_VERSION {
-		log.Printf("Dev environemnt. Not executing tasks.")
-	} else {
-		log.Println("Task: " + task.Task)
-		log.Println("Args: " + task.Args.String)
-		switch task.Task {
-		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...")
-			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()
+		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 "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...")
-			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)
-				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":
-
-			log.Println("Starting Cloudflare Tunnel...")
-			taskResult := taskStartTunnel()
-			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":
-
-			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 "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}
-
 		}
 
+	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...")
+		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)
+			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":
+
+		log.Println("Starting Cloudflare Tunnel...")
+		taskResult := taskStartTunnel()
+		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":
+
+		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 "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())
@@ -427,10 +422,9 @@ func ExecuteSchedules(tick int) {
 		// 	})
 		// }
 
-		if diagnostics.GetReleaseVersion() == diagnostics.CLOUD_VERSION {
-			log.Println("Setting up cloud version options (name, email, api token)")
-			taskSetupCloudOptions()
-		}
+
+		log.Println("Setting up cloud version options (name, email, api token)")
+		taskSetupCloudOptions()
 
 		// Executing on startup (first tick). Schedules run before tasks in the SystemIterator
 		uptime := taskGetSystemUptime()
@@ -1196,7 +1190,7 @@ func taskGetSystemUptime() string {
 func taskGetStorageDevices() string {
 	fmt.Println("Executing taskGetStorageDevices")
 
-	devices := storage.GetDevices(diagnostics.GetReleaseVersion())
+	devices := storage.GetDevices()
 	devicesJSON, _ := json.Marshal(devices)
 
 	utils.WriteOption("STORAGE_DEVICES_LIST", string(devicesJSON))