mirror of
https://github.com/edgebox-iot/edgeboxctl.git
synced 2026-09-30 08:35:45 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Malachi Soord
|
d0460cea09 | ||
|
Malachi Soord
|
f0bfc92295 |
@@ -13,16 +13,16 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v5
|
||||
uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: '1.20.2'
|
||||
go-version: ^1.15
|
||||
- name: Check out code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v3
|
||||
- name: Build
|
||||
run: make build
|
||||
- name: Test
|
||||
run: make test-with-coverage
|
||||
# - uses: codecov/codecov-action@v1
|
||||
# with:
|
||||
# token: ${{ secrets.CODECOV_TOKEN }}
|
||||
# files: coverage.out
|
||||
- uses: codecov/codecov-action@v1
|
||||
with:
|
||||
token: ${{ secrets.CODECOV_TOKEN }}
|
||||
files: coverage.out
|
||||
|
||||
Vendored
-236
@@ -1,236 +0,0 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "Build",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["build"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build All",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["build-all"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"group": "build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build Prod",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["build-prod"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"group": "build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build Cloud",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["build-cloud"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"group": "build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build ARM64",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["build-arm64"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"group": "build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build ARMHF",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["build-armhf"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"group": "build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build AMD64",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["build-amd64"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"group": "build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Clean",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["clean"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Test",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["test"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Test with Coverage",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["test-with-coverage"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Run",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["run"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Install",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["install"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Install Prod",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["install-prod"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Install Cloud",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["install-cloud"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Install ARM64",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["install-arm64"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Install ARMHF",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["install-armhf"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Install AMD64",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["install-amd64"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Start",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["start"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Stop",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["stop"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Restart",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["restart"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Status",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["status"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Logs",
|
||||
"type": "shell",
|
||||
"command": "make",
|
||||
"args": ["log"],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
"problemMatcher": []
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
## [1.3.2] - 08-12-2024
|
||||
|
||||
* Fix to Browser Dev feature:
|
||||
* Checking browser dev url when internet_accessible was checking the incorrect path. This is now fixed.
|
||||
|
||||
## [1.3.1] - 08-12-2024
|
||||
|
||||
* Fixes to Browser Dev feature:
|
||||
* Now edgeboxctl also fetches or generates the browser dev environment url and saves it into an option both when starting, and every time the browser dev status is fetched.
|
||||
|
||||
## [1.3.0] - 05-12-2024
|
||||
|
||||
* Added Edgebox Browser Development Environment Feature Support
|
||||
* Added tasks for handling browser development environment into tasks.go
|
||||
* Added executable tasks to ExecuteTask and scheduled ones to ExecuteSchedules
|
||||
* Other bug fixes and improvements.
|
||||
|
||||
### Missing Past Releases
|
||||
|
||||
Release notes for past versions are not available in this file. Please refer to the [GitHub releases](https://hithub.com/edgebox-iot/edgeboxctl/releases) for more information. Feel free to contribute to this file by adding missing release notes.
|
||||
|
||||
+5
-3
@@ -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
|
||||
@@ -1,23 +1,14 @@
|
||||
.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:
|
||||
@echo "\n🏗️ Building all architectures for ${RELEASE} mode"
|
||||
@echo "🟡 This will build all supported architectures and release combinations. It can take a while...\n"
|
||||
|
||||
GOOS=linux GOARCH=amd64 make build
|
||||
GOOS=linux GOARCH=arm make build
|
||||
|
||||
@echo "\n🟢 All builds completed and available at ./bin/ \n"
|
||||
|
||||
build-prod:
|
||||
GOOS=linux GOARCH=arm RELEASE=prod make build
|
||||
|
||||
@@ -30,85 +21,45 @@ build-arm64:
|
||||
build-armhf:
|
||||
GOOS=linux GOARCH=arm RELEASE=prod make build
|
||||
|
||||
build-amd64:
|
||||
GOOS=linux GOARCH=amd64 RELEASE=prod make build
|
||||
|
||||
|
||||
build:
|
||||
@echo "\n🏗️ Building edgeboxctl (${RELEASE} release) on ${GOOS} (${GOARCH})"
|
||||
@echo "📦 Binary will be saved in ./${BUILD_DIR}/edgeboxctl-${GOOS}-${GOARCH}\n"
|
||||
|
||||
@echo "Building ${GOOS}-${GOARCH}"
|
||||
GOOS=${GOOS} GOARCH=${GOARCH} go build \
|
||||
-trimpath -ldflags "-s -w -X ${PROJECT}/internal/diagnostics.Version=${RELEASE} \
|
||||
-X ${PROJECT}/internal/diagnostics.Commit=${COMMIT} \
|
||||
-X ${PROJECT}/internal/diagnostics.BuildDate=${BUILD_DATE}" \
|
||||
-o bin/edgeboxctl-${GOOS}-${GOARCH} ${PROJECT}/cmd/edgeboxctl
|
||||
|
||||
@echo "\n🟢 Build task completed\n"
|
||||
cp ./bin/edgeboxctl-${GOOS}-${GOARCH} ./bin/edgeboxctl
|
||||
|
||||
clean:
|
||||
@echo "🧹 Cleaning build directory and go cache\n"
|
||||
|
||||
rm -rf ${BUILD_DIR}
|
||||
go clean
|
||||
|
||||
@echo "\n🟢 Clean task completed\n"
|
||||
|
||||
test:
|
||||
go test -tags=unit -timeout=600s -v ./...
|
||||
|
||||
test-with-coverage:
|
||||
go test -tags=unit -timeout=600s -v ./... -coverprofile=coverage.out
|
||||
|
||||
run:
|
||||
@echo "\n🚀 Running edgeboxctl\n"
|
||||
./bin/edgeboxctl-${GOOS}-${GOARCH}
|
||||
|
||||
install:
|
||||
@echo "📦 Installing edgeboxctl service (${RELEASE}) for ${GOOS} (${GOARCH})\n"
|
||||
|
||||
@echo "🚧 Stopping edgeboxctl service if it is running"
|
||||
sudo systemctl stop edgeboxctl || true
|
||||
|
||||
@echo "\n🗑️ Removing old edgeboxctl binary and service"
|
||||
sudo rm -rf /usr/local/bin/edgeboxctl /usr/local/sbin/edgeboctl /lib/systemd/system/edgeboxctl.service
|
||||
|
||||
@echo "\n🚚 Copying edgeboxctl binary to /usr/local/bin"
|
||||
sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /usr/local/bin/edgeboxctl
|
||||
sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /usr/local/sbin/edgeboxctl
|
||||
|
||||
@echo "\n🚚 Copying edgeboxctl service to /lib/systemd/system"
|
||||
sudo systemctl stop edgeboxctl
|
||||
sudo rm -rf /usr/local/bin/edgeboxctl /lib/systemd/system/edgeboxctl.service
|
||||
sudo cp ./bin/edgeboxctl /usr/local/bin/edgeboxctl
|
||||
sudo cp ./edgeboxctl.service /lib/systemd/system/edgeboxctl.service
|
||||
sudo systemctl daemon-reload
|
||||
|
||||
@echo "\n 🚀 To start edgeboxctl run: make start"
|
||||
@echo "🟢 Edgeboxctl installed successfully\n"
|
||||
@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
|
||||
|
||||
start:
|
||||
@echo "\n 🚀 Starting edgeboxctl service\n"
|
||||
systemctl start edgeboxctl
|
||||
@echo "\n 🟢 Edgebox service started\n"
|
||||
|
||||
stop:
|
||||
@echo "\n✋ Stopping edgeboxctl service\n"
|
||||
systemctl stop edgeboxctl
|
||||
@echo "\n 🟢 Edgebox service stopped\n"
|
||||
|
||||
restart:
|
||||
@echo "\n💫 Restarting edgeboxctl service\n"
|
||||
systemctl restart edgeboxctl
|
||||
@echo "\n 🟢 Edgebox service restarted\n"
|
||||
|
||||
status:
|
||||
@echo "\nℹ️ edgeboxctl Service Info:\n"
|
||||
systemctl status edgeboxctl
|
||||
|
||||
log:
|
||||
@echo "\n📰 edgeboxctl service logs:\n"
|
||||
log: start
|
||||
journalctl -fu edgeboxctl
|
||||
|
||||
|
||||
@@ -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
|
||||
* docker compose
|
||||
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
|
||||
```
|
||||
|
||||
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.
|
||||
|
||||
+2
-3
@@ -1,4 +1,3 @@
|
||||
codecov:
|
||||
require_ci_to_pass: no
|
||||
|
||||
comment: false
|
||||
github_checks:
|
||||
annotations: false
|
||||
|
||||
@@ -4,14 +4,14 @@ go 1.15
|
||||
|
||||
require (
|
||||
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
|
||||
github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2 // indirect
|
||||
github.com/dustin/go-humanize v1.0.0 // indirect
|
||||
github.com/go-ole/go-ole v1.2.5 // indirect
|
||||
github.com/go-sql-driver/mysql v1.9.0
|
||||
github.com/go-yaml/yaml v2.1.0+incompatible
|
||||
github.com/go-sql-driver/mysql v1.5.0
|
||||
github.com/joho/godotenv v1.3.0
|
||||
github.com/mattn/go-sqlite3 v1.14.7
|
||||
github.com/shirou/gopsutil v3.21.4+incompatible
|
||||
github.com/stretchr/testify v1.10.0 // indirect
|
||||
github.com/mattn/go-sqlite3 v1.14.7 // 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
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
)
|
||||
|
||||
@@ -1,45 +1,72 @@
|
||||
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||
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/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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
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/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.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo=
|
||||
github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw=
|
||||
github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
|
||||
github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
|
||||
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
||||
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
|
||||
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
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-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
|
||||
github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
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/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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/Hmo4=
|
||||
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=
|
||||
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=
|
||||
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
|
||||
go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
|
||||
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
|
||||
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
|
||||
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
|
||||
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
|
||||
go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
|
||||
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
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-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=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
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=
|
||||
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
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.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
|
||||
+17
-259
@@ -11,7 +11,6 @@ import (
|
||||
|
||||
"github.com/edgebox-iot/edgeboxctl/internal/system"
|
||||
"github.com/edgebox-iot/edgeboxctl/internal/utils"
|
||||
"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
|
||||
)
|
||||
|
||||
// EdgeApp : Struct representing an EdgeApp in the system
|
||||
@@ -19,15 +18,11 @@ type EdgeApp struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Experimental bool `json:"experimental"`
|
||||
Status EdgeAppStatus `json:"status"`
|
||||
Services []EdgeAppService `json:"services"`
|
||||
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
|
||||
@@ -48,30 +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 postInstallFilename = "/edgebox-postinstall.done"
|
||||
const myEdgeAppServiceEnvFilename = "/myedgeapp.env"
|
||||
const defaultContainerOperationSleepTime time.Duration = time.Second * 10
|
||||
|
||||
@@ -89,8 +63,6 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
|
||||
|
||||
edgeAppName := ID
|
||||
edgeAppDescription := ""
|
||||
edgeAppExperimental := false
|
||||
edgeAppOptions := []EdgeAppOption{}
|
||||
|
||||
edgeAppEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + envFilename)
|
||||
|
||||
@@ -103,108 +75,8 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
|
||||
if edgeAppEnv["EDGEAPP_DESCRIPTION"] != "" {
|
||||
edgeAppDescription = edgeAppEnv["EDGEAPP_DESCRIPTION"]
|
||||
}
|
||||
if edgeAppEnv["EDGEAPP_EXPERIMENTAL"] == "true" {
|
||||
edgeAppExperimental = true
|
||||
}
|
||||
}
|
||||
|
||||
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 := ""
|
||||
|
||||
@@ -218,36 +90,16 @@ 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,
|
||||
Name: edgeAppName,
|
||||
Description: edgeAppDescription,
|
||||
Experimental: edgeAppExperimental,
|
||||
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,
|
||||
}
|
||||
@@ -271,53 +123,21 @@ func IsEdgeAppInstalled(ID string) bool {
|
||||
|
||||
}
|
||||
|
||||
func writeAppRunnableFiles(ID string) bool {
|
||||
edgeAppPath := utils.GetPath(utils.EdgeAppsPath)
|
||||
_, err := os.Stat(edgeAppPath + ID + runnableFilename)
|
||||
if os.IsNotExist(err) {
|
||||
_, err := os.Create(edgeAppPath + ID + runnableFilename)
|
||||
if err != nil {
|
||||
log.Fatal("Runnable file for EdgeApp could not be created!")
|
||||
return false
|
||||
}
|
||||
|
||||
// Check the block default apps option
|
||||
blockDefaultAppsOption := utils.ReadOption("DASHBOARD_BLOCK_DEFAULT_APPS_PUBLIC_ACCESS")
|
||||
if blockDefaultAppsOption != "yes" {
|
||||
// Create myedgeapp.env file with default network URL
|
||||
envFilePath := edgeAppPath + ID + myEdgeAppServiceEnvFilename
|
||||
|
||||
var networkURL string
|
||||
domainName := utils.ReadOption("DOMAIN_NAME")
|
||||
|
||||
if domainName != "" {
|
||||
networkURL = ID + "." + domainName
|
||||
} else if diagnostics.GetReleaseVersion() == diagnostics.CLOUD_VERSION {
|
||||
cluster := utils.ReadOption("CLUSTER")
|
||||
username := utils.ReadOption("USERNAME")
|
||||
if cluster != "" && username != "" {
|
||||
networkURL = username + "-" + ID + "." + cluster
|
||||
}
|
||||
} else {
|
||||
networkURL = ID + "." + system.GetHostname() + ".local" // default
|
||||
}
|
||||
|
||||
env, _ := godotenv.Unmarshal("INTERNET_URL=" + networkURL)
|
||||
err = godotenv.Write(env, envFilePath)
|
||||
if err != nil {
|
||||
log.Printf("Error creating myedgeapp.env file: %s", err)
|
||||
// result = false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func SetEdgeAppInstalled(ID string) bool {
|
||||
|
||||
result := true
|
||||
edgeAppPath := utils.GetPath(utils.EdgeAppsPath)
|
||||
|
||||
if writeAppRunnableFiles(ID) {
|
||||
_, err := os.Stat(edgeAppPath + ID + runnableFilename)
|
||||
if os.IsNotExist(err) {
|
||||
|
||||
_, err := os.Create(edgeAppPath + ID + runnableFilename)
|
||||
result = true
|
||||
|
||||
if err != nil {
|
||||
log.Fatal("Runnable file for EdgeApp could not be created!")
|
||||
result = false
|
||||
}
|
||||
|
||||
buildFrameworkContainers()
|
||||
|
||||
@@ -332,63 +152,13 @@ func SetEdgeAppInstalled(ID string) bool {
|
||||
|
||||
}
|
||||
|
||||
func SetEdgeAppBulkInstalled(IDs []string) bool {
|
||||
|
||||
result := true
|
||||
|
||||
for _, ID := range IDs {
|
||||
writeAppRunnableFiles(ID)
|
||||
}
|
||||
|
||||
buildFrameworkContainers()
|
||||
|
||||
return result
|
||||
|
||||
}
|
||||
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + postInstallFilename)
|
||||
if err != nil {
|
||||
result = false
|
||||
log.Println(err)
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
buildFrameworkContainers()
|
||||
@@ -477,24 +247,12 @@ func GetEdgeAppServices(ID string) []EdgeAppService {
|
||||
var edgeAppServices []EdgeAppService
|
||||
|
||||
for _, serviceID := range serviceSlices {
|
||||
shouldBeRunning := false
|
||||
cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
|
||||
cmdResult := utils.Exec(wsPath, "docker-compose", cmdArgs)
|
||||
isRunning := false
|
||||
|
||||
// Is service "runnable" when .run lockfile in the app folder
|
||||
_, err := os.Stat(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
|
||||
if !os.IsNotExist(err) {
|
||||
shouldBeRunning = true
|
||||
if cmdResult != "" {
|
||||
isRunning = true
|
||||
}
|
||||
|
||||
// Check if the service is actually running
|
||||
if shouldBeRunning {
|
||||
cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
|
||||
cmdResult := utils.Exec(wsPath, "docker-compose", cmdArgs)
|
||||
if cmdResult != "" {
|
||||
isRunning = true
|
||||
}
|
||||
}
|
||||
|
||||
edgeAppServices = append(edgeAppServices, EdgeAppService{ID: serviceID, IsRunning: isRunning})
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ package storage
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
@@ -74,13 +73,12 @@ const (
|
||||
DISK_TYPE_SDA DeviceIdentifier = "sda"
|
||||
DISK_TYPE_MCBLK DeviceIdentifier = "mmcblk0"
|
||||
DISK_TYPE_VDA DeviceIdentifier = "vda"
|
||||
MIN_DISK_SIZE int = 1048576 // 1GB in bytes
|
||||
)
|
||||
|
||||
func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
|
||||
switch release_version {
|
||||
case diagnostics.CLOUD_VERSION:
|
||||
return DISK_TYPE_SDA
|
||||
return DISK_TYPE_VDA
|
||||
case diagnostics.PROD_VERSION:
|
||||
return DISK_TYPE_MCBLK
|
||||
}
|
||||
@@ -136,13 +134,7 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
|
||||
currentDevice.InUse = currentDeviceInUseFlag
|
||||
currentDeviceInUseFlag = false
|
||||
currentPartitions = []Partition{}
|
||||
size, err := strconv.Atoi(currentDevice.Size)
|
||||
if err != nil {
|
||||
size = 0
|
||||
}
|
||||
if size > MIN_DISK_SIZE {
|
||||
devices = append(devices, currentDevice)
|
||||
}
|
||||
devices = append(devices, currentDevice)
|
||||
} else {
|
||||
firstDevice = false
|
||||
}
|
||||
@@ -201,22 +193,8 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
|
||||
currentDevice.Status.Description = "Not configured"
|
||||
}
|
||||
currentDevice.InUse = currentDeviceInUseFlag
|
||||
devices = append([]Device{currentDevice}, devices...) // Prepending the first device...
|
||||
|
||||
fmt.Println("Secondary Storage Devices Found: ", len(devices))
|
||||
fmt.Println("Main Storage Device size: ", currentDevice.Size)
|
||||
|
||||
// only append device if size > 1GB
|
||||
if currentDevice.Size != "" && currentDevice.Size != "0" {
|
||||
// Convert size to int
|
||||
// Convert string to int
|
||||
size, err := strconv.Atoi(currentDevice.Size)
|
||||
if err != nil {
|
||||
size = 0
|
||||
}
|
||||
if size > MIN_DISK_SIZE {
|
||||
devices = append([]Device{currentDevice}, devices...) // Prepending the first device...
|
||||
}
|
||||
}
|
||||
devices = getDevicesSpaceUsage(devices)
|
||||
|
||||
return devices
|
||||
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"log"
|
||||
"os"
|
||||
"io"
|
||||
"errors"
|
||||
"os/exec"
|
||||
"bufio"
|
||||
"path/filepath"
|
||||
@@ -18,7 +17,6 @@ import (
|
||||
|
||||
"github.com/joho/godotenv"
|
||||
"github.com/shirou/gopsutil/host"
|
||||
"github.com/go-yaml/yaml"
|
||||
)
|
||||
|
||||
type cloudflaredTunnelJson struct {
|
||||
@@ -94,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"])
|
||||
}
|
||||
@@ -118,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)
|
||||
@@ -427,174 +378,3 @@ func CopyFile(src string, dest string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func CheckUpdates() {
|
||||
fmt.Println("Checking for Edgebox System Updates.")
|
||||
|
||||
// Configure the service and start it
|
||||
cmd := exec.Command("sh", "/home/system/components/updater/run.sh", "--check")
|
||||
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()
|
||||
fmt.Println("Error running updates check.")
|
||||
utils.WriteOption("SYSTEM_UPDATES", "[]")
|
||||
return
|
||||
}
|
||||
|
||||
// Read targets.env file into JSON list structure
|
||||
targets := []string{}
|
||||
targetsFile, err := os.Open("/home/system/components/updater/targets.env")
|
||||
if err != nil {
|
||||
fmt.Println("No targets.env file found. Skipping.")
|
||||
utils.WriteOption("SYSTEM_UPDATES", "[]")
|
||||
return
|
||||
}
|
||||
defer targetsFile.Close()
|
||||
scanner = bufio.NewScanner(targetsFile)
|
||||
for scanner.Scan() {
|
||||
text := scanner.Text()
|
||||
// text line should look like: {"target": "<target>", "version": "<version>"}
|
||||
target := strings.Split(text, "=")
|
||||
newText := "{\"target\": \"" + strings.Replace(target[0], "_VERSION", "", -1) + "\", \"version\": \"" + target[1] + "\"}"
|
||||
targets = append(targets, newText)
|
||||
}
|
||||
if scanner.Err() != nil {
|
||||
fmt.Println("Error reading update targets file.")
|
||||
utils.WriteOption("SYSTEM_UPDATES", "[]")
|
||||
return
|
||||
}
|
||||
|
||||
// convert targets to string
|
||||
targetsString := strings.Join(targets, ",")
|
||||
targetsString = "[" + targetsString + "]"
|
||||
|
||||
fmt.Println(targetsString)
|
||||
|
||||
// Write option with targets
|
||||
utils.WriteOption("SYSTEM_UPDATES", targetsString)
|
||||
}
|
||||
|
||||
func ApplyUpdates() {
|
||||
fmt.Println("Applying Edgebox System Updates.")
|
||||
|
||||
utils.WriteOption("UPDATING_SYSTEM", "true")
|
||||
|
||||
// Configure the service and start it
|
||||
cmd := exec.Command("sh", "/home/system/components/updater/run.sh", "--update")
|
||||
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())
|
||||
}
|
||||
|
||||
// If the system did not yet restart, set updating system to false
|
||||
utils.WriteOption("UPDATING_SYSTEM", "false")
|
||||
}
|
||||
|
||||
func FetchBrowserDevPasswordFromFile() (string, error) {
|
||||
fmt.Println("Executing FetchBrowserDevPasswordFromFile")
|
||||
|
||||
// Read the "password" entry on the yaml file
|
||||
// Read the yaml file in system.GetPath(BrowserDevPasswordFileLocation)
|
||||
yamlFile, err := ioutil.ReadFile(utils.GetPath(utils.BrowserDevPasswordFileLocation))
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Parse the yaml file and get the "password" entry
|
||||
var yamlFileMap yaml.MapSlice
|
||||
err = yaml.Unmarshal(yamlFile, &yamlFileMap)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
for _, item := range yamlFileMap {
|
||||
key, value := item.Key, item.Value
|
||||
if key == "password" {
|
||||
if pwString, ok := value.(string); ok {
|
||||
return pwString, nil
|
||||
} else {
|
||||
return "", errors.New("password value is not a string")
|
||||
}
|
||||
}
|
||||
}
|
||||
return "", errors.New("password key not found")
|
||||
}
|
||||
|
||||
func SetBrowserDevPasswordFile(password string) error {
|
||||
// Get current password from file
|
||||
currentPassword, err := FetchBrowserDevPasswordFromFile()
|
||||
if err != nil {
|
||||
fmt.Println("Error fetching current password from file.")
|
||||
return err
|
||||
}
|
||||
|
||||
// Write the new password on the file using ReplaceTextInFile
|
||||
err = ReplaceTextInFile(utils.GetPath(utils.BrowserDevPasswordFileLocation), currentPassword, password)
|
||||
if err != nil {
|
||||
fmt.Println("Error writing new password to file.")
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func ReplaceTextInFile(filePath string, oldText string, newText string) error {
|
||||
// Open the file for reading
|
||||
file, err := os.OpenFile(filePath, os.O_RDWR, 0644)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Read the file contents
|
||||
data, err := ioutil.ReadAll(file)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Close the file
|
||||
err = file.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Replace the text in the file
|
||||
newData := strings.Replace(string(data), oldText, newText, -1)
|
||||
|
||||
// Write the new data back to the file
|
||||
err = ioutil.WriteFile(filePath, []byte(newData), 0644)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
|
||||
+7
-592
@@ -18,8 +18,6 @@ import (
|
||||
"github.com/edgebox-iot/edgeboxctl/internal/system"
|
||||
"github.com/edgebox-iot/edgeboxctl/internal/utils"
|
||||
|
||||
"github.com/joho/godotenv"
|
||||
|
||||
_ "github.com/go-sql-driver/mysql" // Mysql Driver
|
||||
_ "github.com/mattn/go-sqlite3" // SQlite Driver
|
||||
)
|
||||
@@ -35,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"`
|
||||
}
|
||||
@@ -58,10 +45,6 @@ type taskInstallEdgeAppArgs struct {
|
||||
ID string `json:"id"`
|
||||
}
|
||||
|
||||
type taskInstallBulkEdgeAppsArgs struct {
|
||||
IDS []string `json:"ids"`
|
||||
}
|
||||
|
||||
type taskRemoveEdgeAppArgs struct {
|
||||
ID string `json:"id"`
|
||||
}
|
||||
@@ -70,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"`
|
||||
@@ -106,14 +74,6 @@ type taskSetupBackupsArgs struct {
|
||||
RepositoryPassword string `json:"repository_password"`
|
||||
}
|
||||
|
||||
type taskStartShellArgs struct {
|
||||
Timeout int `json:"timeout"`
|
||||
}
|
||||
|
||||
type taskSetBrowserDevPasswordArgs struct {
|
||||
Password string `json:"password"`
|
||||
}
|
||||
|
||||
|
||||
const STATUS_CREATED int = 0
|
||||
const STATUS_EXECUTING int = 1
|
||||
@@ -156,33 +116,6 @@ func GetNextTask() Task {
|
||||
|
||||
}
|
||||
|
||||
// GetExecutingTasks : Performs a MySQL query over the device's Edgebox API to obtain all tasks that are currently executing
|
||||
func GetExecutingTasks() []Task {
|
||||
// Will try to connect to API database, which should be running locally under WS.
|
||||
db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails())
|
||||
if err != nil {
|
||||
panic(err.Error())
|
||||
}
|
||||
results, err := db.Query("SELECT id, task, args, status, result, created, updated FROM task WHERE status = 1;")
|
||||
if err != nil {
|
||||
panic(err.Error())
|
||||
}
|
||||
|
||||
var tasks []Task
|
||||
for results.Next() {
|
||||
// for each row, scan the result into our task composite object
|
||||
var task Task
|
||||
err = results.Scan(&task.ID, &task.Task, &task.Args, &task.Status, &task.Result, &task.Created, &task.Updated)
|
||||
if err != nil {
|
||||
panic(err.Error()) // proper error handling instead of panic in your app
|
||||
}
|
||||
tasks = append(tasks, task)
|
||||
}
|
||||
results.Close()
|
||||
db.Close()
|
||||
return tasks
|
||||
}
|
||||
|
||||
// ExecuteTask : Performs execution of the given task, updating the task status as it goes, and publishing the task result
|
||||
func ExecuteTask(task Task) Task {
|
||||
|
||||
@@ -281,27 +214,6 @@ func ExecuteTask(task Task) Task {
|
||||
taskResult := taskDisableTunnel()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
|
||||
case "start_shell":
|
||||
log.Println("Starting SSHX.io Shell")
|
||||
var args taskStartShellArgs
|
||||
err := json.Unmarshal([]byte(task.Args.String), &args)
|
||||
if err != nil {
|
||||
log.Printf("Error reading arguments or start_shell task: %s", err)
|
||||
} else {
|
||||
taskResult := taskStartShell(args)
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
}
|
||||
|
||||
case "stop_shell":
|
||||
log.Println("Stopping SSHX.io Shell...")
|
||||
taskResult := taskStopShell()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
|
||||
case "activate_browser_dev":
|
||||
log.Println("Activating Browser Dev Environment")
|
||||
taskResult := taskActivateBrowserDev()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
|
||||
case "install_edgeapp":
|
||||
|
||||
log.Println("Installing EdgeApp...")
|
||||
@@ -314,18 +226,6 @@ func ExecuteTask(task Task) Task {
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
}
|
||||
|
||||
case "install_bulk_edgeapps":
|
||||
|
||||
log.Println("Installing Bulk EdgeApps...")
|
||||
var args taskInstallBulkEdgeAppsArgs
|
||||
err := json.Unmarshal([]byte(task.Args.String), &args)
|
||||
if err != nil {
|
||||
log.Printf("Error reading arguments of install_bulk_edgeapps task: %s", err)
|
||||
} else {
|
||||
taskResult := taskInstallBulkEdgeApps(args)
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
}
|
||||
|
||||
case "remove_edgeapp":
|
||||
|
||||
log.Println("Removing EdgeApp...")
|
||||
@@ -362,43 +262,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 "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...")
|
||||
@@ -441,49 +304,6 @@ func ExecuteTask(task Task) Task {
|
||||
taskResult := taskDisablePublicDashboard()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
|
||||
case "check_updates":
|
||||
log.Println("Checking for updates...")
|
||||
taskResult := taskCheckSystemUpdates()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
|
||||
case "apply_updates":
|
||||
|
||||
log.Println("Updating Edgebox System...")
|
||||
is_updating := utils.ReadOption("UPDATING_SYSTEM")
|
||||
if is_updating == "true" {
|
||||
log.Println("Edgebox update was running... Probably system restarted. Finishing update...")
|
||||
utils.WriteOption("UPDATING_SYSTEM", "false")
|
||||
task.Result = sql.NullString{String: "{result: true}", Valid: true}
|
||||
} else {
|
||||
log.Println("Updating Edgebox System...")
|
||||
taskResult := taskUpdateSystem()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
}
|
||||
|
||||
case "set_browserdev_password":
|
||||
|
||||
log.Println("Setting BrowserDev Password...")
|
||||
var args taskSetBrowserDevPasswordArgs
|
||||
err := json.Unmarshal([]byte(task.Args.String), &args)
|
||||
if err != nil {
|
||||
log.Printf("Error reading arguments of set_browserdev_password task: %s", err)
|
||||
} else {
|
||||
taskResult := taskSetBrowserDevPassword(args)
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
}
|
||||
|
||||
case "activate_browserdev":
|
||||
|
||||
log.Println("Activating BrowserDev Environment...")
|
||||
taskResult := taskActivateBrowserDev()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
|
||||
case "deactivate_browserdev":
|
||||
|
||||
log.Println("Deactivating BrowserDev Environment...")
|
||||
taskResult := taskDeactivateBrowserDev()
|
||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -504,7 +324,6 @@ func ExecuteTask(task Task) Task {
|
||||
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
|
||||
@@ -530,12 +349,6 @@ func ExecuteSchedules(tick int) {
|
||||
|
||||
if tick == 1 {
|
||||
|
||||
log.Println("Fetching Browser Dev Environment Information")
|
||||
taskGetBrowserDevPassword()
|
||||
taskGetBrowserDevStatus()
|
||||
|
||||
taskCheckSystemUpdates()
|
||||
|
||||
ip := taskGetSystemIP()
|
||||
log.Println("System IP is: " + ip)
|
||||
|
||||
@@ -561,10 +374,8 @@ func ExecuteSchedules(tick int) {
|
||||
log.Println("Uptime is " + uptime + " seconds (" + system.GetUptimeFormatted() + ")")
|
||||
|
||||
log.Println(taskGetStorageDevices())
|
||||
taskStartWs()
|
||||
log.Println(taskGetEdgeApps())
|
||||
taskUpdateSystemLoggerServices()
|
||||
taskRecoverFromUpdate()
|
||||
|
||||
}
|
||||
|
||||
if tick%5 == 0 {
|
||||
@@ -573,14 +384,9 @@ func ExecuteSchedules(tick int) {
|
||||
log.Println(taskGetStorageDevices())
|
||||
}
|
||||
|
||||
if tick%15 == 0 {
|
||||
taskGetBrowserDevStatus()
|
||||
}
|
||||
|
||||
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")
|
||||
|
||||
@@ -615,15 +421,6 @@ func ExecuteSchedules(tick int) {
|
||||
|
||||
if tick%3600 == 0 {
|
||||
// Executing every 3600 ticks (1 hour)
|
||||
taskGetBrowserDevStatus()
|
||||
taskCheckSystemUpdates()
|
||||
|
||||
}
|
||||
|
||||
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...)
|
||||
@@ -1036,19 +833,12 @@ func taskSetupTunnel(args taskSetupTunnelArgs) string {
|
||||
}
|
||||
|
||||
func taskStartTunnel() string {
|
||||
fmt.Println("Executing taskStartTunnel")
|
||||
|
||||
// Read tunnel status to check if cloudflare is configured
|
||||
tunnelStatus := utils.ReadOption("TUNNEL_STATUS")
|
||||
if tunnelStatus != "" {
|
||||
// Only start cloudflared if we have a tunnel configured
|
||||
system.StartService("cloudflared")
|
||||
domainName := utils.ReadOption("DOMAIN_NAME")
|
||||
status := "{\"status\": \"connected\", \"domain\": \"" + domainName + "\"}"
|
||||
utils.WriteOption("TUNNEL_STATUS", status)
|
||||
}
|
||||
|
||||
return "{\"status\": \"ok\"}"
|
||||
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 {
|
||||
@@ -1070,182 +860,6 @@ func taskDisableTunnel() string {
|
||||
return "{\"status\": \"ok\"}"
|
||||
}
|
||||
|
||||
func taskStartShell(args taskStartShellArgs) string {
|
||||
fmt.Println("Executing taskStartShell")
|
||||
wsPath := utils.GetPath(utils.WsPath)
|
||||
|
||||
// kill the process if its running
|
||||
utils.Exec(wsPath, "killall", []string{"sshx"})
|
||||
|
||||
cmd := exec.Command("/usr/local/bin/sshx", "--quiet", "--shell", "bash")
|
||||
stdout, err := cmd.StdoutPipe()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
scanner := bufio.NewScanner(stdout)
|
||||
err = cmd.Start()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
url := ""
|
||||
|
||||
timeout := args.Timeout
|
||||
|
||||
for scanner.Scan() {
|
||||
fmt.Println(scanner.Text())
|
||||
text := scanner.Text()
|
||||
if strings.Contains(text, "https://") {
|
||||
url = text
|
||||
fmt.Println("Shell start is responding with URL: " + url)
|
||||
utils.WriteOption("SHELL_URL", url)
|
||||
utils.WriteOption("SHELL_STATUS", "running")
|
||||
break
|
||||
}
|
||||
}
|
||||
if scanner.Err() != nil {
|
||||
cmd.Process.Kill()
|
||||
cmd.Wait()
|
||||
panic(scanner.Err())
|
||||
}
|
||||
|
||||
go func() {
|
||||
fmt.Println("Running shell async")
|
||||
|
||||
// cmd.Wait()
|
||||
|
||||
// Keep retrying to calculate timeout to know when to kill the process
|
||||
for {
|
||||
timeout = timeout - 1
|
||||
if timeout <= 0 {
|
||||
fmt.Println("Timeout reached, killing process...")
|
||||
utils.Exec(wsPath, "killall sshx", []string{})
|
||||
utils.WriteOption("SHELL_STATUS", "not_running")
|
||||
break
|
||||
}
|
||||
if timeout%10 == 0 {
|
||||
fmt.Println("Active Shell Timeout is " + fmt.Sprint(timeout) + " seconds")
|
||||
}
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
}()
|
||||
|
||||
return "{\"status\": \"ok\"}"
|
||||
}
|
||||
|
||||
func taskStopShell() string {
|
||||
fmt.Println("Executing taskStopShell")
|
||||
wsPath := utils.GetPath(utils.WsPath)
|
||||
|
||||
// kill the process if its running
|
||||
utils.Exec(wsPath, "killall", []string{"sshx"})
|
||||
utils.WriteOption("SHELL_STATUS", "not_running")
|
||||
|
||||
return "{\"status\": \"ok\"}"
|
||||
|
||||
}
|
||||
|
||||
func taskGetBrowserDevStatus() string {
|
||||
fmt.Println("Executing taskGetBrowserDevStatus")
|
||||
|
||||
// Read status from systemctl status code-server@root
|
||||
browserDevStatus := utils.Exec(
|
||||
utils.GetPath(utils.WsPath),
|
||||
"sh",
|
||||
[]string{"-c", "systemctl --quiet is-active code-server@root && echo 'active' || echo 'inactive'"},
|
||||
)
|
||||
if browserDevStatus == "active" {
|
||||
fmt.Println("Browser Dev Environment is running")
|
||||
utils.WriteOption("BROWSERDEV_STATUS", "running")
|
||||
taskGetBrowserDevUrl()
|
||||
|
||||
return "{\"status\": \"running\"}"
|
||||
|
||||
} else {
|
||||
fmt.Println("Browser Dev Environment is not running")
|
||||
utils.WriteOption("BROWSERDEV_STATUS", "not_running")
|
||||
return "{\"status\": \"not_running\"}"
|
||||
}
|
||||
}
|
||||
|
||||
func taskGetBrowserDevUrl() string {
|
||||
url := ""
|
||||
myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.BrowserDevPath) + "myedgeapp.env")
|
||||
if err != nil {
|
||||
log.Println("No myedge.app environment file found. Status is Network-Only")
|
||||
url = "http://dev." + system.GetHostname() + ".local"
|
||||
} else {
|
||||
if myEdgeAppServiceEnv["INTERNET_URL"] != "" {
|
||||
url = "https://" + myEdgeAppServiceEnv["INTERNET_URL"]
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println("Browser Dev Url: " + url)
|
||||
|
||||
utils.WriteOption("BROWSERDEV_URL", url)
|
||||
return url
|
||||
}
|
||||
|
||||
func taskActivateBrowserDev() string {
|
||||
fmt.Println("Executing taskActivateBrowserDev")
|
||||
wsPath := utils.GetPath(utils.WsPath)
|
||||
|
||||
// Start the service
|
||||
utils.Exec(wsPath, "systemctl", []string{"start", "code-server@root"})
|
||||
// Write run file to /home/system/components/dev/.run
|
||||
utils.Exec(wsPath, "touch", []string{utils.GetPath(utils.BrowserDevProxyPath) + ".run"})
|
||||
// Rebuild WS (necessary to start the proxy)
|
||||
system.StartWs()
|
||||
// Write control option for API
|
||||
utils.WriteOption("BROWSERDEV_STATUS", "running")
|
||||
|
||||
// Write and refresh the dev environment password option
|
||||
taskGetBrowserDevPassword()
|
||||
|
||||
return "{\"status\": \"ok\"}"
|
||||
}
|
||||
|
||||
func taskDeactivateBrowserDev() string {
|
||||
fmt.Println("Executing taskDeactivateBrowserDev")
|
||||
wsPath := utils.GetPath(utils.WsPath)
|
||||
|
||||
// Remove the run file
|
||||
os.Remove(utils.GetPath(utils.BrowserDevProxyPath) + ".run")
|
||||
system.StartWs()
|
||||
|
||||
utils.Exec(wsPath, "systemctl", []string{"stop", "code-server@root"})
|
||||
utils.WriteOption("BROWSERDEV_STATUS", "not_running")
|
||||
|
||||
return "{\"status\": \"ok\"}"
|
||||
}
|
||||
|
||||
func taskGetBrowserDevPassword() string {
|
||||
fmt.Println("Executing taskGetBrowserDevPassword")
|
||||
|
||||
password, err := system.FetchBrowserDevPasswordFromFile()
|
||||
if err == nil {
|
||||
utils.WriteOption("BROWSERDEV_PASSWORD", password)
|
||||
} else {
|
||||
fmt.Println("Error fetching browser dev password from file: " + err.Error())
|
||||
}
|
||||
|
||||
return password
|
||||
}
|
||||
|
||||
func taskSetBrowserDevPassword(args taskSetBrowserDevPasswordArgs) string {
|
||||
fmt.Println("Executing taskSetBrowserDevPassword")
|
||||
wsPath := utils.GetPath(utils.WsPath)
|
||||
|
||||
system.SetBrowserDevPasswordFile(args.Password)
|
||||
utils.WriteOption("BROWSERDEV_PASSWORD", args.Password)
|
||||
|
||||
// Check if BROWSERDEV_STATUS is "running", if so, restart the service
|
||||
if utils.ReadOption("BROWSERDEV_STATUS") == "running" {
|
||||
utils.Exec(wsPath, "systemctl", []string{"restart", "code-server@root"})
|
||||
}
|
||||
|
||||
return "{\"status\": \"ok\"}"
|
||||
}
|
||||
|
||||
func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
|
||||
fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
|
||||
|
||||
@@ -1256,16 +870,6 @@ func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
|
||||
return string(resultJSON)
|
||||
}
|
||||
|
||||
func taskInstallBulkEdgeApps(args taskInstallBulkEdgeAppsArgs) string {
|
||||
fmt.Println("Executing taskInstallBulkEdgeApps for " + strings.Join(args.IDS, ", "))
|
||||
|
||||
// args.Apps is a list of edgeapp ids
|
||||
edgeapps.SetEdgeAppBulkInstalled(args.IDS)
|
||||
|
||||
taskGetEdgeApps()
|
||||
return "{\"status\": \"ok\"}"
|
||||
}
|
||||
|
||||
func taskRemoveEdgeApp(args taskRemoveEdgeAppArgs) string {
|
||||
fmt.Println("Executing taskRemoveEdgeApp for " + args.ID)
|
||||
|
||||
@@ -1298,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)
|
||||
|
||||
@@ -1463,39 +945,6 @@ func taskDisablePublicDashboard() string {
|
||||
return "{result: false}"
|
||||
}
|
||||
|
||||
func taskCheckSystemUpdates() string {
|
||||
fmt.Println("Executing taskCheckSystemUpdates")
|
||||
system.CheckUpdates()
|
||||
return "{result: true}"
|
||||
}
|
||||
|
||||
func taskUpdateSystem() string {
|
||||
fmt.Println("Executing taskUpdateSystem")
|
||||
system.ApplyUpdates()
|
||||
utils.WriteOption("LAST_UPDATE", strconv.FormatInt(time.Now().Unix(), 10))
|
||||
return "{result: true}"
|
||||
}
|
||||
|
||||
func taskRecoverFromUpdate() string {
|
||||
fmt.Println("Executing taskRecoverFromUpdate")
|
||||
executing_tasks := GetExecutingTasks()
|
||||
// Filter out the task with task value "update_system"
|
||||
filteredTasks := []Task{}
|
||||
for _, task := range executing_tasks {
|
||||
if task.Task != "update_system" {
|
||||
filteredTasks = append(filteredTasks, task)
|
||||
}
|
||||
}
|
||||
|
||||
// If tasks is not empty, Get the last task
|
||||
if len(filteredTasks) > 0 {
|
||||
lastTask := filteredTasks[len(filteredTasks)-1]
|
||||
ExecuteTask(lastTask)
|
||||
}
|
||||
|
||||
return "{result: true}"
|
||||
}
|
||||
|
||||
func taskSetReleaseVersion() string {
|
||||
|
||||
fmt.Println("Executing taskSetReleaseVersion")
|
||||
@@ -1505,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")
|
||||
|
||||
@@ -1580,8 +1000,3 @@ func taskSetupCloudOptions() {
|
||||
fmt.Println("Executing taskSetupCloudOptions")
|
||||
system.SetupCloudOptions()
|
||||
}
|
||||
|
||||
func taskStartWs() {
|
||||
fmt.Println("Executing taskStartWs")
|
||||
system.StartWs()
|
||||
}
|
||||
|
||||
+1
-35
@@ -111,11 +111,6 @@ const ApiPath string = "apiPath"
|
||||
const EdgeAppsPath string = "edgeAppsPath"
|
||||
const EdgeAppsBackupPath string = "edgeAppsBackupPath"
|
||||
const WsPath string = "wsPath"
|
||||
const BrowserDevPath string = "browserDevPath"
|
||||
const LoggerPath string = "loggerPath"
|
||||
const BrowserDevPasswordFileLocation string = "browserDevPasswordFileLocation"
|
||||
const BrowserDevProxyPath string = "browserDevProxyPath"
|
||||
|
||||
|
||||
// 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 {
|
||||
@@ -135,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:
|
||||
@@ -177,21 +172,6 @@ func GetPath(pathKey string) string {
|
||||
targetPath = "/home/system/components/ws/"
|
||||
}
|
||||
|
||||
case BrowserDevPath:
|
||||
|
||||
if env["BROWSERDEV_PATH"] != "" {
|
||||
targetPath = env["BROWSERDEV_PATH"]
|
||||
} else {
|
||||
targetPath = "/home/system/components/dev/"
|
||||
}
|
||||
|
||||
case LoggerPath:
|
||||
if env["LOGGER_PATH"] != "" {
|
||||
targetPath = env["LOGGER_PATH"]
|
||||
} else {
|
||||
targetPath = "/home/system/components/logger/"
|
||||
}
|
||||
|
||||
case BackupPasswordFileLocation:
|
||||
|
||||
if env["BACKUP_PASSWORD_FILE_LOCATION"] != "" {
|
||||
@@ -200,20 +180,6 @@ func GetPath(pathKey string) string {
|
||||
targetPath = "/home/system/components/backups/pw.txt"
|
||||
}
|
||||
|
||||
case BrowserDevPasswordFileLocation:
|
||||
if env["BROWSERDEV_PASSWORD_FILE_LOCATION"] != "" {
|
||||
targetPath = env["BROWSERDEV_PASSWORD_FILE_LOCATION"]
|
||||
} else {
|
||||
targetPath = "/root/.config/code-server/config.yaml"
|
||||
}
|
||||
|
||||
case BrowserDevProxyPath:
|
||||
if env["BROWSERDEV_PROXY_PATH"] != "" {
|
||||
targetPath = env["BROWSERDEV_PROXY_PATH"]
|
||||
} else {
|
||||
targetPath = "/home/system/components/dev/"
|
||||
}
|
||||
|
||||
default:
|
||||
|
||||
log.Printf("path_key %s nonexistant in GetPath().\n", pathKey)
|
||||
|
||||
Reference in New Issue
Block a user