MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Please enter the commit message for your changes. Lines starting

Browse Source 
with '#' will be ignored, and an empty message aborts the commit.

 Author:    Ethan Alicea <64653625+Tech-Gamer@users.noreply.github.com>

 On branch develop
 Your branch is up to date with 'origin/develop'.

 Changes to be committed:
	modified:   .github/workflows/push.yaml
	modified:   .github/workflows/release.yaml
	modified:   CHANGELOG.md
	modified:   Dockerfile
	modified:   Makefile
	modified:   README.md
	modified:   cmd/configure.go
	modified:   cmd/diagnostics.go
	modified:   cmd/root.go
	modified:   config/config.go
	modified:   environment/allocations.go
	modified:   environment/docker.go
	modified:   environment/docker/api.go
	modified:   environment/docker/container.go
	modified:   environment/docker/environment.go
	modified:   environment/docker/power.go
	modified:   environment/docker/stats.go
	modified:   environment/environment.go
	modified:   environment/settings.go
	modified:   events/events.go
	modified:   go.mod
	modified:   internal/cron/activity_cron.go
	modified:   internal/cron/cron.go
	modified:   internal/cron/sftp_cron.go
	modified:   internal/database/database.go
	modified:   internal/progress/progress.go
	modified:   internal/progress/progress_test.go
	modified:   loggers/cli/cli.go
	new file:   oryxBuildBinary
	modified:   parser/parser.go
	modified:   remote/http.go
	modified:   remote/servers.go
	modified:   remote/types.go
	modified:   router/downloader/downloader.go
	modified:   router/middleware.go
	modified:   router/middleware/middleware.go
	modified:   router/middleware/request_error.go
	modified:   router/router.go
	modified:   router/router_download.go
	modified:   router/router_server.go
	modified:   router/router_server_backup.go
	modified:   router/router_server_files.go
	modified:   router/router_server_transfer.go
	modified:   router/router_server_ws.go
	modified:   router/router_system.go
	modified:   router/router_transfer.go
	modified:   router/tokens/parser.go
	modified:   router/websocket/listeners.go
	modified:   router/websocket/websocket.go
	modified:   server/activity.go
	modified:   server/backup.go
	modified:   server/backup/backup.go
	modified:   server/backup/backup_local.go
	modified:   server/backup/backup_s3.go
	modified:   server/configuration.go
	modified:   server/console.go
	modified:   server/crash.go
	modified:   server/events.go
	modified:   server/filesystem/archive.go
	modified:   server/filesystem/filesystem.go
	modified:   server/filesystem/filesystem_test.go
	modified:   server/install.go
	modified:   server/installer/installer.go
	modified:   server/listeners.go
	modified:   server/manager.go
	modified:   server/mounts.go
	modified:   server/power.go
	modified:   server/power_test.go
	modified:   server/resources.go
	modified:   server/server.go
	modified:   server/transfer/archive.go
	modified:   server/transfer/source.go
	modified:   server/transfer/transfer.go
	modified:   server/update.go
	modified:   sftp/event.go
	modified:   sftp/handler.go
	modified:   sftp/server.go
	modified:   wings.go
This commit is contained in:
Ethan Alicea 2023-09-11 17:22:09 +00:00 committed by GitHub
parent 438e5fdbe9
commit 4390bad36b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 198 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/push.yaml vendored
View File

@ -40,7 +40,7 @@ jobs:
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
CGO_ENABLED: 0
SRC_PATH: github.com/pterodactyl/wings
SRC_PATH: github.com/Tech-Gamer/nwy-wings
run: |
go build -v -trimpath -ldflags="-s -w -X ${SRC_PATH}/system.Version=dev-${GIT_COMMIT:0:7}" -o dist/wings ${SRC_PATH}
go build -v -trimpath -ldflags="-X ${SRC_PATH}/system.Version=dev-${GIT_COMMIT:0:7}" -o dist/wings_debug ${SRC_PATH}

4
.github/workflows/release.yaml vendored
View File

@ -24,9 +24,9 @@ jobs:
CGO_ENABLED: 0
REF: ${{ github.ref }}
run: |
GOARCH=amd64 go build -o dist/wings_linux_amd64 -v -trimpath -ldflags="-s -w -X github.com/pterodactyl/wings/system.Version=${REF:11}" github.com/pterodactyl/wings
GOARCH=amd64 go build -o dist/wings_linux_amd64 -v -trimpath -ldflags="-s -w -X github.com/Tech-Gamer/nwy-wings/system.Version=${REF:11}" github.com/Tech-Gamer/nwy-wings
chmod 755 dist/wings_linux_amd64
GOARCH=arm64 go build -o dist/wings_linux_arm64 -v -trimpath -ldflags="-s -w -X github.com/pterodactyl/wings/system.Version=${REF:11}" github.com/pterodactyl/wings
GOARCH=arm64 go build -o dist/wings_linux_arm64 -v -trimpath -ldflags="-s -w -X github.com/Tech-Gamer/nwy-wings/system.Version=${REF:11}" github.com/Tech-Gamer/nwy-wings
chmod 755 dist/wings_linux_arm64
- name: Extract changelog

4
CHANGELOG.md
View File

@ -11,13 +11,13 @@
## v1.11.5
### Added
* Added a config option to disable Wings config.yml updates from the Panel (https://github.com/pterodactyl/wings/commit/ec6d6d83ea3eb14995c24f001233e85b37ffb87b)
* Added a config option to disable Wings config.yml updates from the Panel (https://github.com/Tech-Gamer/nwy-wings/commit/ec6d6d83ea3eb14995c24f001233e85b37ffb87b)
### Changed
* Wings is now built with Go 1.19.7
### Fixed
* Fixed archives containing partially matched file names (https://github.com/pterodactyl/wings/commit/43b3496f0001cec231c80af1f9a9b3417d04e8d4)
* Fixed archives containing partially matched file names (https://github.com/Tech-Gamer/nwy-wings/commit/43b3496f0001cec231c80af1f9a9b3417d04e8d4)
## v1.11.4
### Fixed

2
Dockerfile
View File

@ -8,7 +8,7 @@ COPY go.mod go.sum /app/
RUN go mod download
COPY . /app/
RUN CGO_ENABLED=0 go build \
-ldflags="-s -w -X github.com/pterodactyl/wings/system.Version=$VERSION" \
-ldflags="-s -w -X github.com/Tech-Gamer/nwy-wings/system.Version=$VERSION" \
-v \
-trimpath \
-o wings \

4
Makefile
View File

@ -5,13 +5,13 @@ build:
GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -gcflags "all=-trimpath=$(pwd)" -o build/wings_linux_arm64 -v wings.go
debug:
go build -ldflags="-X github.com/pterodactyl/wings/system.Version=$(GIT_HEAD)"
go build -ldflags="-X github.com/Tech-Gamer/nwy-wings/system.Version=$(GIT_HEAD)"
sudo ./wings --debug --ignore-certificate-errors --config config.yml --pprof --pprof-block-rate 1
# Runs a remotly debuggable session for Wings allowing an IDE to connect and target
# different breakpoints.
rmdebug:
go build -gcflags "all=-N -l" -ldflags="-X github.com/pterodactyl/wings/system.Version=$(GIT_HEAD)" -race
go build -gcflags "all=-N -l" -ldflags="-X github.com/Tech-Gamer/nwy-wings/system.Version=$(GIT_HEAD)" -race
sudo dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient exec ./wings -- --debug --ignore-certificate-errors --config config.yml
cross-build: clean build compress

2
README.md
View File

@ -2,7 +2,7 @@
![Discord](https://img.shields.io/discord/122900397965705216?label=Discord&logo=Discord&logoColor=white)
![GitHub Releases](https://img.shields.io/github/downloads/pterodactyl/wings/latest/total)
[![Go Report Card](https://goreportcard.com/badge/github.com/pterodactyl/wings)](https://goreportcard.com/report/github.com/pterodactyl/wings)
[![Go Report Card](https://goreportcard.com/badge/github.com/Tech-Gamer/nwy-wings)](https://goreportcard.com/report/github.com/Tech-Gamer/nwy-wings)
# Pterodactyl Wings

2
cmd/configure.go
View File

@ -16,7 +16,7 @@ import (
"github.com/goccy/go-json"
"github.com/spf13/cobra"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
var configureArgs struct {

8
cmd/diagnostics.go
View File

@ -22,10 +22,10 @@ import (
"github.com/goccy/go-json"
"github.com/spf13/cobra"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/loggers/cli"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/loggers/cli"
"github.com/Tech-Gamer/nwy-wings/system"
)
const (

24
cmd/root.go
View File

@ -26,16 +26,16 @@ import (
"golang.org/x/crypto/acme"
"golang.org/x/crypto/acme/autocert"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/internal/cron"
"github.com/pterodactyl/wings/internal/database"
"github.com/pterodactyl/wings/loggers/cli"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/router"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/sftp"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/internal/cron"
"github.com/Tech-Gamer/nwy-wings/internal/database"
"github.com/Tech-Gamer/nwy-wings/loggers/cli"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/router"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/sftp"
"github.com/Tech-Gamer/nwy-wings/system"
)
var (
@ -431,8 +431,8 @@ __ [blue][bold]Pterodactyl[reset] _____/___/_______ _______ ______
Copyright © 2018 - %d Dane Everitt & Contributors
Website: https://pterodactyl.io
Source: https://github.com/pterodactyl/wings
License: https://github.com/pterodactyl/wings/blob/develop/LICENSE
Source: https://github.com/Tech-Gamer/nwy-wings
License: https://github.com/Tech-Gamer/nwy-wings/blob/develop/LICENSE
This software is made available under the terms of the MIT license.
The above copyright notice and this permission notice shall be included

4
config/config.go
View File

@ -22,7 +22,7 @@ import (
"github.com/gbrlsnchs/jwt/v3"
"gopkg.in/yaml.v2"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/system"
)
const DefaultLocation = "/etc/pterodactyl/config.yml"
@ -279,7 +279,7 @@ type Configuration struct {
// if the debug flag is passed through the command line arguments.
Debug bool
AppName string `default:"Pterodactyl" json:"app_name" yaml:"app_name"`
AppName string `default:"Nightway Hosting" json:"app_name" yaml:"app_name"`
// A unique identifier for this node in the Panel.
Uuid string

2
environment/allocations.go
View File

@ -6,7 +6,7 @@ import (
"github.com/docker/go-connections/nat"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
// Defines the allocations available for a given server. When using the Docker environment

2
environment/docker.go
View File

@ -11,7 +11,7 @@ import (
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
var (

2
environment/docker/api.go
View File

@ -15,7 +15,7 @@ import (
"github.com/docker/docker/errdefs"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
var (

6
environment/docker/container.go
View File

@ -17,9 +17,9 @@ import (
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/system"
)
var ErrNotAttached = errors.Sentinel("not attached to instance")

8
environment/docker/environment.go
View File

@ -11,10 +11,10 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/system"
)
type Metadata struct {

4
environment/docker/power.go
View File

@ -13,8 +13,8 @@ import (
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/remote"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/remote"
)
// OnBeforeStart run before the container starts and get the process

2
environment/docker/stats.go
View File

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment"
)
// Uptime returns the current uptime of the container in milliseconds. If the

2
environment/environment.go
View File

@ -5,7 +5,7 @@ import (
"os"
"time"
"github.com/pterodactyl/wings/events"
"github.com/Tech-Gamer/nwy-wings/events"
)
const (

2
environment/settings.go
View File

@ -8,7 +8,7 @@ import (
"github.com/apex/log"
"github.com/docker/docker/api/types/container"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
type Mount struct {

2
events/events.go
View File

@ -6,7 +6,7 @@ import (
"emperror.dev/errors"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Event represents an Event sent over a Bus.

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/pterodactyl/wings
module github.com/Tech-Gamer/nwy-wings
go 1.18

8
internal/cron/activity_cron.go
View File

@ -6,10 +6,10 @@ import (
"emperror.dev/errors"
"github.com/pterodactyl/wings/internal/database"
"github.com/pterodactyl/wings/internal/models"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/internal/database"
"github.com/Tech-Gamer/nwy-wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/system"
)
type activityCron struct {

6
internal/cron/cron.go
View File

@ -8,9 +8,9 @@ import (
"github.com/apex/log"
"github.com/go-co-op/gocron"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/system"
)
const ErrCronRunning = errors.Sentinel("cron: job already running")

8
internal/cron/sftp_cron.go
View File

@ -6,10 +6,10 @@ import (
"emperror.dev/errors"
"github.com/pterodactyl/wings/internal/database"
"github.com/pterodactyl/wings/internal/models"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/internal/database"
"github.com/Tech-Gamer/nwy-wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/system"
)
type sftpCron struct {

6
internal/database/database.go
View File

@ -9,9 +9,9 @@ import (
"gorm.io/gorm"
"gorm.io/gorm/logger"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/internal/models"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/system"
)
var (

2
internal/progress/progress.go
View File

@ -5,7 +5,7 @@ import (
"strings"
"sync/atomic"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Progress is used to track the progress of any I/O operation that are being

2
internal/progress/progress_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/franela/goblin"
"github.com/pterodactyl/wings/internal/progress"
"github.com/Tech-Gamer/nwy-wings/internal/progress"
)
func TestProgress(t *testing.T) {

8
loggers/cli/cli.go
View File

@ -90,15 +90,15 @@ func (h *Handler) HandleLog(e *log.Entry) error {
// Stacktrace:
// readlink test: no such file or directory
// failed to read symlink target for 'test'
// github.com/pterodactyl/wings/server/filesystem.(*Archive).addToArchive
// github.com/pterodactyl/wings/server/filesystem/archive.go:166
// github.com/Tech-Gamer/nwy-wings/server/filesystem.(*Archive).addToArchive
// github.com/Tech-Gamer/nwy-wings/server/filesystem/archive.go:166
// ... (Truncated the stack for easier reading)
// runtime.goexit
// runtime/asm_amd64.s:1374
// **NEW LINE INSERTED HERE**
// backup: error while generating server backup
// github.com/pterodactyl/wings/server.(*Server).Backup
// github.com/pterodactyl/wings/server/backup.go:84
// github.com/Tech-Gamer/nwy-wings/server.(*Server).Backup
// github.com/Tech-Gamer/nwy-wings/server/backup.go:84
// ... (Truncated the stack for easier reading)
// runtime.goexit
// runtime/asm_amd64.s:1374

BIN
oryxBuildBinary Executable file
View File

Binary file not shown.

2
parser/parser.go
View File

@ -17,7 +17,7 @@ import (
"gopkg.in/ini.v1"
"gopkg.in/yaml.v3"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
// The file parsing options that are available for a server configuration file.

4
remote/http.go
View File

@ -10,14 +10,14 @@ import (
"strings"
"time"
"github.com/pterodactyl/wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/internal/models"
"emperror.dev/errors"
"github.com/apex/log"
"github.com/cenkalti/backoff/v4"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/system"
)
type Client interface {

2
remote/servers.go
View File

@ -6,7 +6,7 @@ import (
"strconv"
"sync"
"github.com/pterodactyl/wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/internal/models"
"emperror.dev/errors"
"github.com/apex/log"

2
remote/types.go
View File

@ -8,7 +8,7 @@ import (
"github.com/apex/log"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/parser"
"github.com/Tech-Gamer/nwy-wings/parser"
)
const (

2
router/downloader/downloader.go
View File

@ -17,7 +17,7 @@ import (
"github.com/goccy/go-json"
"github.com/google/uuid"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/server"
)
var client = &http.Client{

4
router/middleware.go
View File

@ -3,8 +3,8 @@ package router
import (
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/server"
)
// ExtractServer returns the server instance from the gin context. If there is

6
router/middleware/middleware.go
View File

@ -11,9 +11,9 @@ import (
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server"
)
// AttachRequestID attaches a unique ID to the incoming HTTP request so that any

4
router/middleware/request_error.go
View File

@ -10,8 +10,8 @@ import (
"github.com/apex/log"
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
// RequestError is a custom error type returned when something goes wrong with

8
router/router.go
View File

@ -5,10 +5,10 @@ import (
"github.com/apex/log"
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/router/middleware"
wserver "github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
wserver "github.com/Tech-Gamer/nwy-wings/server"
)
// Configure configures the routing infrastructure for this daemon instance.

6
router/router_download.go
View File

@ -9,9 +9,9 @@ import (
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/router/tokens"
"github.com/pterodactyl/wings/server/backup"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/router/tokens"
"github.com/Tech-Gamer/nwy-wings/server/backup"
)
// Handle a download request for a server backup.

10
router/router_server.go
View File

@ -10,11 +10,11 @@ import (
"github.com/apex/log"
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/router/downloader"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/router/tokens"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/transfer"
"github.com/Tech-Gamer/nwy-wings/router/downloader"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/router/tokens"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/transfer"
)
// Returns a single server from the collection of servers.

6
router/router_server_backup.go
View File

@ -9,9 +9,9 @@ import (
"github.com/apex/log"
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/backup"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/backup"
)
// postServerBackup performs a backup against a given server instance using the

14
router/router_server_files.go
View File

@ -18,13 +18,13 @@ import (
"github.com/gin-gonic/gin"
"golang.org/x/sync/errgroup"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/internal/models"
"github.com/pterodactyl/wings/router/downloader"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/router/tokens"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/router/downloader"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/router/tokens"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
// getServerFileContents returns the contents of a file on the server.

10
router/router_server_transfer.go
View File

@ -9,11 +9,11 @@ import (
"emperror.dev/errors"
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/installer"
"github.com/pterodactyl/wings/server/transfer"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/installer"
"github.com/Tech-Gamer/nwy-wings/server/transfer"
)
// Data passed over to initiate a server transfer.

4
router/router_server_ws.go
View File

@ -8,8 +8,8 @@ import (
"github.com/goccy/go-json"
ws "github.com/gorilla/websocket"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/router/websocket"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/router/websocket"
)
var expectedCloseCodes = []int{

10
router/router_system.go
View File

@ -9,11 +9,11 @@ import (
"github.com/apex/log"
"github.com/gin-gonic/gin"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/installer"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/installer"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Returns information about the system that wings is running on.

10
router/router_transfer.go
View File

@ -18,11 +18,11 @@ import (
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/router/tokens"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/installer"
"github.com/pterodactyl/wings/server/transfer"
"github.com/Tech-Gamer/nwy-wings/router/middleware"
"github.com/Tech-Gamer/nwy-wings/router/tokens"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/installer"
"github.com/Tech-Gamer/nwy-wings/server/transfer"
)
// postTransfers .

2
router/tokens/parser.go
View File

@ -5,7 +5,7 @@ import (
"github.com/gbrlsnchs/jwt/v3"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
type TokenData interface {

6
router/websocket/listeners.go
View File

@ -8,10 +8,10 @@ import (
"emperror.dev/errors"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/system"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/server"
)
// RegisterListenerEvents will setup the server event listeners and expiration

14
router/websocket/websocket.go
View File

@ -8,7 +8,7 @@ import (
"sync"
"time"
"github.com/pterodactyl/wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/internal/models"
"emperror.dev/errors"
"github.com/apex/log"
@ -18,13 +18,13 @@ import (
"github.com/google/uuid"
"github.com/gorilla/websocket"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/system"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/environment/docker"
"github.com/pterodactyl/wings/router/tokens"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment/docker"
"github.com/Tech-Gamer/nwy-wings/router/tokens"
"github.com/Tech-Gamer/nwy-wings/server"
)
const (

4
server/activity.go
View File

@ -6,8 +6,8 @@ import (
"emperror.dev/errors"
"github.com/pterodactyl/wings/internal/database"
"github.com/pterodactyl/wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/internal/database"
"github.com/Tech-Gamer/nwy-wings/internal/models"
)
const ActivityPowerPrefix = "server:power."

6
server/backup.go
View File

@ -10,9 +10,9 @@ import (
"github.com/apex/log"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/backup"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/backup"
)
// Notifies the panel of a backup's state and returns an error if one is encountered

4
server/backup/backup.go
View File

@ -14,8 +14,8 @@ import (
"github.com/mholt/archiver/v4"
"golang.org/x/sync/errgroup"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
)
var format = archiver.CompressedArchive{

6
server/backup/backup_local.go
View File

@ -9,9 +9,9 @@ import (
"github.com/juju/ratelimit"
"github.com/mholt/archiver/v4"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
type LocalBackup struct {

6
server/backup/backup_s3.go
View File

@ -14,9 +14,9 @@ import (
"github.com/juju/ratelimit"
"github.com/mholt/archiver/v4"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
type S3Backup struct {

2
server/configuration.go
View File

@ -3,7 +3,7 @@ package server
import (
"sync"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment"
)
type EggConfiguration struct {

4
server/console.go
View File

@ -7,8 +7,8 @@ import (
"github.com/mitchellh/colorstring"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/system"
)
// appName is a local cache variable to avoid having to make expensive copies of

5
server/crash.go
View File

@ -8,8 +8,8 @@ import (
"emperror.dev/errors"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
)
type CrashHandler struct {
@ -70,6 +70,7 @@ func (s *Server) handleServerCrash() error {
}
s.PublishConsoleOutputFromDaemon("---------- Detected server process in a crashed state! ----------")
s.PublishConsoleOutputFromDaemon("---------- If you need help, please contact Nightway Hosting support. ----------")
s.PublishConsoleOutputFromDaemon(fmt.Sprintf("Exit code: %d", exitCode))
s.PublishConsoleOutputFromDaemon(fmt.Sprintf("Out of memory: %t", oomKilled))

4
server/events.go
View File

@ -1,8 +1,8 @@
package server
import (
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Defines all the possible output events for a server.

4
server/filesystem/archive.go
View File

@ -18,8 +18,8 @@ import (
"github.com/klauspost/pgzip"
ignore "github.com/sabhiram/go-gitignore"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/internal/progress"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/internal/progress"
)
const memory = 4 * 1024

4
server/filesystem/filesystem.go
View File

@ -19,8 +19,8 @@ import (
"github.com/karrick/godirwalk"
ignore "github.com/sabhiram/go-gitignore"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/system"
)
type Filesystem struct {

2
server/filesystem/filesystem_test.go
View File

@ -13,7 +13,7 @@ import (
. "github.com/franela/goblin"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
func NewFs() (*Filesystem, *rootFs) {

8
server/install.go
View File

@ -19,10 +19,10 @@ import (
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Install executes the installation stack for a server process. Bubbles any

4
server/installer/installer.go
View File

@ -6,8 +6,8 @@ import (
"emperror.dev/errors"
"github.com/asaskevich/govalidator"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server"
)
type Installer struct {

8
server/listeners.go
View File

@ -9,11 +9,11 @@ import (
"github.com/apex/log"
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/system"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/remote"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/remote"
)
var dockerEvents = []string{

10
server/manager.go
View File

@ -15,11 +15,11 @@ import (
"github.com/gammazero/workerpool"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/environment/docker"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment/docker"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
type Manager struct {

4
server/mounts.go
View File

@ -6,8 +6,8 @@ import (
"github.com/apex/log"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
)
// To avoid confusion when working with mounts, assume that a server.Mount has not been properly

4
server/power.go
View File

@ -9,8 +9,8 @@ import (
"emperror.dev/errors"
"github.com/google/uuid"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
)
type PowerAction string

2
server/power_test.go
View File

@ -5,7 +5,7 @@ import (
. "github.com/franela/goblin"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/system"
)
func TestPower(t *testing.T) {

4
server/resources.go
View File

@ -4,8 +4,8 @@ import (
"sync"
"sync/atomic"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/system"
)
// ResourceUsage defines the current resource usage for a given server instance. If a server is offline you

12
server/server.go
View File

@ -13,12 +13,12 @@ import (
"github.com/creasty/defaults"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Server is the high level definition for a server instance being controlled

4
server/transfer/archive.go
View File

@ -5,8 +5,8 @@ import (
"fmt"
"io"
"github.com/pterodactyl/wings/internal/progress"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/internal/progress"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
// Archive returns an archive that can be used to stream the contents of the

2
server/transfer/source.go
View File

@ -11,7 +11,7 @@ import (
"net/http"
"time"
"github.com/pterodactyl/wings/internal/progress"
"github.com/Tech-Gamer/nwy-wings/internal/progress"
)
// PushArchiveToTarget POSTs the archive to the target node and returns the

4
server/transfer/transfer.go
View File

@ -7,8 +7,8 @@ import (
"github.com/apex/log"
"github.com/mitchellh/colorstring"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Status represents the current status of a transfer.

4
server/update.go
View File

@ -3,9 +3,9 @@ package server
import (
"time"
"github.com/pterodactyl/wings/environment/docker"
"github.com/Tech-Gamer/nwy-wings/environment/docker"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment"
)
// SyncWithEnvironment updates the environment for the server to match any of

4
sftp/event.go
View File

@ -4,8 +4,8 @@ import (
"emperror.dev/errors"
"github.com/apex/log"
"github.com/pterodactyl/wings/internal/database"
"github.com/pterodactyl/wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/internal/database"
"github.com/Tech-Gamer/nwy-wings/internal/models"
)
type eventHandler struct {

6
sftp/handler.go
View File

@ -13,9 +13,9 @@ import (
"github.com/pkg/sftp"
"golang.org/x/crypto/ssh"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
const (

6
sftp/server.go
View File

@ -19,9 +19,9 @@ import (
"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/ssh"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server"
)
// Usernames all follow the same format, so don't even bother hitting the API if the username is not

2
wings.go
View File

@ -4,7 +4,7 @@ import (
"math/rand"
"time"
"github.com/pterodactyl/wings/cmd"
"github.com/Tech-Gamer/nwy-wings/cmd"
)
func main() {