numenor-labs/dsfx
2
0
Fork 0
mirror of https://git.numenor-labs.us/dsfx.git synced 2025-04-29 08:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(project): redo binary structure

Browse Source
This commit is contained in:
Dustin Stiles 2025-03-22 12:26:17 -04:00
parent e22e9c6fae
commit 336b371449
Signed by: duwstiles
GPG Key ID: BCD9912EC231FC87
6 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -4,7 +4,7 @@ WORKDIR /app
COPY . . COPY . .
RUN GOOS=linux CGO_ENABLED=0 go build -o /app/dsfx ./cmd/dsfxnode RUN GOOS=linux CGO_ENABLED=0 go build -o /app/dsfx ./cmd/dsfx
FROM scratch FROM scratch

2
README.md
View File

@ -12,7 +12,7 @@ _DSFX is a next generation file exchange that that liberates users from big tech
```bash ```bash
# Run a server # Run a server
go run koti.casa/numenor-labs/dsfx/cmd/dsfxnode@latest go run koti.casa/numenor-labs/dsfx/cmd/dsfx@latest
# serving: dsfx://0.0.0.0:8000#<ed25519_public_key> # serving: dsfx://0.0.0.0:8000#<ed25519_public_key>
# Get the client # Get the client

26
cmd/dsfx/main.go
View File

@ -1,9 +1,31 @@
package main package main
import ( import (
"log" "context"
"log/slog"
"koti.casa/numenor-labs/dsfx/internal/lib/disk"
"koti.casa/numenor-labs/dsfx/internal/lib/system"
"koti.casa/numenor-labs/dsfx/internal/peer/node"
"koti.casa/numenor-labs/dsfx/internal/lib/storage/scoped"
) )
func main() { func main() {
log.Println("hello from dsfx!") ctx := context.Background()
sys := system.Default()
configDir := sys.GetEnv("DSFXNODE_CONFIG_DIR")
if configDir == "" {
configDir = "/etc/dsfxnode/config"
}
configScope := scoped.New(disk.Default(), configDir)
err := node.New(configScope, sys).Run(ctx)
if err != nil {
// Log the error and exit with a non-zero status code.
slog.Error("Error running dsfxnode", slog.Any("error", err))
sys.Exit(1)
}
} }

31
cmd/dsfxnode/main.go
View File

@ -1,31 +0,0 @@
package main
import (
"context"
"log/slog"
"koti.casa/numenor-labs/dsfx/internal/lib/disk"
"koti.casa/numenor-labs/dsfx/internal/lib/system"
"koti.casa/numenor-labs/dsfx/internal/peer/node"
"koti.casa/numenor-labs/dsfx/internal/lib/storage/scoped"
)
func main() {
ctx := context.Background()
sys := system.Default()
configDir := sys.GetEnv("DSFXNODE_CONFIG_DIR")
if configDir == "" {
configDir = "/etc/dsfxnode/config"
}
configScope := scoped.New(disk.Default(), configDir)
err := node.New(configScope, sys).Run(ctx)
if err != nil {
// Log the error and exit with a non-zero status code.
slog.Error("Error running dsfxnode", slog.Any("error", err))
sys.Exit(1)
}
}

14
docs/hosting.md
View File

@ -39,16 +39,16 @@ git clone https://koti.casa/numenor-labs/dsfx.git
cd dsfx cd dsfx
go build -o <installation-target> ./cmd/dsfxnode go build -o <installation-target> ./cmd/dsfx
``` ```
## Environment Variables ## Environment Variables
DSFX uses the following environment variables to configure its behavior: DSFX uses the following environment variables to configure its behavior:
| Variable | Description | Default Value | | Variable | Description | Default Value |
| -------------------- | ----------------------------------------------------------- | -------------------- | | ---------------- | ----------------------------------------------------------- | ---------------- |
| DSFXNODE_PORT | The port on which the DSFX server will listen | 8000 | | DSFX_HOST | The host on which the DSFX server will run | 0.0.0.0 |
| DSFXNODE_HOST | The host on which the DSFX server will run | 0.0.0.0 | | DSFX_PORT | The port on which the DSFX server will listen | 8000 |
| DSFXNODE_CONFIG_DIR | The directory where the DSFX configuration files are stored | /etc/dsfxnode/config | | DSFX_CONFIG_DIR | The directory where the DSFX configuration files are stored | /etc/dsfx/config |
| DSFXNODE_STORAGE_DIR | The directory where the DSFX storage files are stored | /etx/dsfxnode/data | | DSFX_STORAGE_DIR | The directory where the DSFX storage files are stored | /etx/dsfx/data |

20
internal/peer/conf/conf.go
View File

@ -3,8 +3,10 @@ package conf
import "koti.casa/numenor-labs/dsfx/internal/lib/system" import "koti.casa/numenor-labs/dsfx/internal/lib/system"
const ( const (
// DefaultConfigDir is the default directory for the dsfxctl configuration. // DefaultConfigDir is the default directory for the dsfx configuration.
DefaultConfigDir = "/etc/dsfxnode/config" DefaultConfigDir = "/etc/dsfx/config"
// DefaultStorageDir is the default directory for the dsfx storage.
DefaultStorageDir = "/etc/dsfx/data"
// DefaultHost is the default host for the dsfxctl application. // DefaultHost is the default host for the dsfxctl application.
DefaultHost = "0.0.0.0" DefaultHost = "0.0.0.0"
// DefaultPort is the default port for the dsfxctl application. // DefaultPort is the default port for the dsfxctl application.
@ -14,7 +16,8 @@ const (
// Conf holds the configuration for the dsfxctl application. // Conf holds the configuration for the dsfxctl application.
type Conf struct { type Conf struct {
// Directories // Directories
ConfigDir string ConfigDir string
StorageDir string
// Networking // Networking
Host string Host string
Port string Port string
@ -23,17 +26,22 @@ type Conf struct {
func FromSystem(sys system.System) Conf { func FromSystem(sys system.System) Conf {
var c Conf var c Conf
c.ConfigDir = sys.GetEnv("DSFXNODE_CONFIG_DIR") c.ConfigDir = sys.GetEnv("DSFX_CONFIG_DIR")
if c.ConfigDir == "" { if c.ConfigDir == "" {
c.ConfigDir = DefaultConfigDir c.ConfigDir = DefaultConfigDir
} }
c.Host = sys.GetEnv("DSFXNODE_HOST") c.StorageDir = sys.GetEnv("DSFX_STORAGE_DIR")
if c.StorageDir == "" {
c.StorageDir = DefaultStorageDir
}
c.Host = sys.GetEnv("DSFX_HOST")
if c.Host == "" { if c.Host == "" {
c.Host = DefaultHost c.Host = DefaultHost
} }
c.Port = sys.GetEnv("DSFXNODE_PORT") c.Port = sys.GetEnv("DSFX_PORT")
if c.Port == "" { if c.Port == "" {
c.Port = DefaultPort c.Port = DefaultPort
} }