From 3fb284d69eb91e6764ce48124d6264758c27d9b9 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 2 Apr 2024 23:57:30 -0400 Subject: [PATCH] change from pterodactyl replace pterodacyl references with pelican through the repo. --- .github/workflows/push.yaml | 2 +- .github/workflows/release.yaml | 4 +-- Dockerfile | 4 +-- Makefile | 4 +-- cmd/configure.go | 4 +-- cmd/diagnostics.go | 12 ++++---- cmd/root.go | 42 ++++++++++++++-------------- config/config.go | 32 ++++++++++----------- config/config_docker.go | 6 ++-- docker-compose.example.yml | 12 ++++---- environment/allocations.go | 6 ++-- environment/docker.go | 6 ++-- environment/docker/api.go | 2 +- environment/docker/container.go | 12 ++++---- environment/docker/environment.go | 10 +++---- environment/docker/power.go | 6 ++-- environment/docker/stats.go | 2 +- environment/environment.go | 2 +- environment/settings.go | 4 +-- events/events.go | 2 +- go.mod | 2 +- internal/cron/activity_cron.go | 8 +++--- internal/cron/cron.go | 6 ++-- internal/cron/sftp_cron.go | 8 +++--- internal/database/database.go | 6 ++-- internal/progress/progress.go | 2 +- internal/progress/progress_test.go | 2 +- internal/ufs/fs_unix_test.go | 2 +- internal/ufs/walk_unix.go | 2 +- loggers/cli/cli.go | 8 +++--- parser/parser.go | 8 +++--- remote/http.go | 8 +++--- remote/http_test.go | 2 +- remote/servers.go | 2 +- remote/types.go | 2 +- router/downloader/downloader.go | 4 +-- router/middleware.go | 4 +-- router/middleware/middleware.go | 6 ++-- router/middleware/request_error.go | 4 +-- router/router.go | 8 +++--- router/router_download.go | 6 ++-- router/router_server.go | 10 +++---- router/router_server_backup.go | 6 ++-- router/router_server_files.go | 18 ++++++------ router/router_server_transfer.go | 10 +++---- router/router_server_ws.go | 4 +-- router/router_system.go | 10 +++---- router/router_transfer.go | 10 +++---- router/tokens/parser.go | 2 +- router/websocket/listeners.go | 8 +++--- router/websocket/websocket.go | 16 +++++------ server/activity.go | 4 +-- server/backup.go | 6 ++-- server/backup/backup.go | 6 ++-- server/backup/backup_local.go | 6 ++-- server/backup/backup_s3.go | 6 ++-- server/config_parser.go | 2 +- server/configuration.go | 2 +- server/console.go | 4 +-- server/crash.go | 4 +-- server/events.go | 4 +-- server/filesystem/archive.go | 8 +++--- server/filesystem/compress.go | 4 +-- server/filesystem/disk_space.go | 4 +-- server/filesystem/errors.go | 2 +- server/filesystem/filesystem.go | 4 +-- server/filesystem/filesystem_test.go | 6 ++-- server/filesystem/path_test.go | 2 +- server/filesystem/stat.go | 2 +- server/install.go | 12 ++++---- server/installer/installer.go | 4 +-- server/listeners.go | 8 +++--- server/manager.go | 10 +++---- server/mounts.go | 4 +-- server/power.go | 4 +-- server/power_test.go | 2 +- server/resources.go | 4 +-- server/server.go | 14 +++++----- server/transfer/archive.go | 4 +-- server/transfer/source.go | 2 +- server/transfer/transfer.go | 4 +-- server/update.go | 6 ++-- sftp/event.go | 4 +-- sftp/handler.go | 6 ++-- sftp/server.go | 6 ++-- wings.go | 2 +- 86 files changed, 270 insertions(+), 270 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index de3fe672..07566a9a 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -40,7 +40,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} CGO_ENABLED: 0 - SRC_PATH: github.com/pterodactyl/wings + SRC_PATH: github.com/pelican-dev/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} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 831a462d..57ea6fc3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -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/pelican-dev/wings/system.Version=${REF:11}" github.com/pelican-dev/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/pelican-dev/wings/system.Version=${REF:11}" github.com/pelican-dev/wings chmod 755 dist/wings_linux_arm64 - name: Extract changelog diff --git a/Dockerfile b/Dockerfile index bf4b1337..366159e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/pelican-dev/wings/system.Version=$VERSION" \ -v \ -trimpath \ -o wings \ @@ -20,6 +20,6 @@ FROM gcr.io/distroless/static:latest COPY --from=builder /etc/os-release /etc/os-release COPY --from=builder /app/wings /usr/bin/ -CMD [ "/usr/bin/wings", "--config", "/etc/pterodactyl/config.yml" ] +CMD [ "/usr/bin/wings", "--config", "/etc/pelican/config.yml" ] EXPOSE 8080 diff --git a/Makefile b/Makefile index b3d5fe53..d9fbc2db 100644 --- a/Makefile +++ b/Makefile @@ -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/pelican-dev/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/pelican-dev/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 diff --git a/cmd/configure.go b/cmd/configure.go index 9c89935f..f873d6b0 100644 --- a/cmd/configure.go +++ b/cmd/configure.go @@ -16,7 +16,7 @@ import ( "github.com/goccy/go-json" "github.com/spf13/cobra" - "github.com/pterodactyl/wings/config" + "github.com/pelican-dev/wings/config" ) var configureArgs struct { @@ -175,7 +175,7 @@ func getRequest() (*http.Request, error) { return nil, err } - r.Header.Set("Accept", "application/vnd.pterodactyl.v1+json") + r.Header.Set("Accept", "application/vnd.pelican.v1+json") r.Header.Set("Content-Type", "application/json") r.Header.Set("Authorization", fmt.Sprintf("Bearer %s", configureArgs.Token)) diff --git a/cmd/diagnostics.go b/cmd/diagnostics.go index c7362e16..78175ac2 100644 --- a/cmd/diagnostics.go +++ b/cmd/diagnostics.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/loggers/cli" + "github.com/pelican-dev/wings/system" ) const ( @@ -94,7 +94,7 @@ func diagnosticsCmdRun(*cobra.Command, []string) { dockerVersion, dockerInfo, dockerErr := getDockerInfo() output := &strings.Builder{} - fmt.Fprintln(output, "Pterodactyl Wings - Diagnostics Report") + fmt.Fprintln(output, "Pelican Wings - Diagnostics Report") printHeader(output, "Versions") fmt.Fprintln(output, " Wings:", system.Version) if dockerErr == nil { @@ -166,7 +166,7 @@ func diagnosticsCmdRun(*cobra.Command, []string) { printHeader(output, "Latest Wings Logs") if diagnosticsArgs.IncludeLogs { - p := "/var/log/pterodactyl/wings.log" + p := "/var/log/pelican/wings.log" if cfg != nil { p = path.Join(cfg.System.LogDirectory, "wings.log") } diff --git a/cmd/root.go b/cmd/root.go index 6aa7d6d8..c53a8eb4 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/internal/cron" + "github.com/pelican-dev/wings/internal/database" + "github.com/pelican-dev/wings/loggers/cli" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/router" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/sftp" + "github.com/pelican-dev/wings/system" ) var ( @@ -45,7 +45,7 @@ var ( var rootCommand = &cobra.Command{ Use: "wings", - Short: "Runs the API server allowing programmatic control of game servers for Pterodactyl Panel.", + Short: "Runs the API server allowing programmatic control of game servers for Pelican Panel.", PreRun: func(cmd *cobra.Command, args []string) { initConfig() initLogging() @@ -107,11 +107,11 @@ func rootCmdRun(cmd *cobra.Command, _ []string) { } log.WithField("timezone", config.Get().System.Timezone).Info("configured wings with system timezone") if err := config.ConfigureDirectories(); err != nil { - log.WithField("error", err).Fatal("failed to configure system directories for pterodactyl") + log.WithField("error", err).Fatal("failed to configure system directories for pelican") return } - if err := config.EnsurePterodactylUser(); err != nil { - log.WithField("error", err).Fatal("failed to create pterodactyl system user") + if err := config.EnsurePelicanUser(); err != nil { + log.WithField("error", err).Fatal("failed to create pelican system user") } log.WithFields(log.Fields{ "username": config.Get().System.Username, @@ -201,8 +201,8 @@ func rootCmdRun(cmd *cobra.Command, _ []string) { // machine is rebooted. It is much better for us to just have a single failed // server instance than an entire offline node. // - // @see https://github.com/pterodactyl/panel/issues/2475 - // @see https://github.com/pterodactyl/panel/issues/3358 + // @see https://github.com/pelican-dev/panel/issues/2475 + // @see https://github.com/pelican-dev/panel/issues/3358 ctx, cancel := context.WithTimeout(cmd.Context(), time.Second*30) defer cancel() @@ -422,7 +422,7 @@ func initLogging() { func printLogo() { fmt.Printf(colorstring.Color(` ____ -__ [blue][bold]Pterodactyl[reset] _____/___/_______ _______ ______ +__ [blue][bold]Pelican[reset] _____/___/_______ _______ ______ \_____\ \/\/ / / / __ / ___/ \___\ / / / / /_/ /___ / \___/\___/___/___/___/___ /______/ @@ -430,9 +430,9 @@ __ [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 +Website: https://pelican.io + Source: https://github.com/pelican-dev/wings +License: https://github.com/pelican-dev/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 @@ -447,7 +447,7 @@ Wings was not able to locate your configuration file, and therefore is not able to complete its boot process. Please ensure you have copied your instance configuration file into the default location below. -Default Location: /etc/pterodactyl/config.yml +Default Location: /etc/pelican/config.yml [yellow]This is not a bug with this software. Please do not make a bug report for this issue, it will be closed.[reset] diff --git a/config/config.go b/config/config.go index 67654c4e..ae8a974a 100644 --- a/config/config.go +++ b/config/config.go @@ -24,10 +24,10 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/system" ) -const DefaultLocation = "/etc/pterodactyl/config.yml" +const DefaultLocation = "/etc/pelican/config.yml" // DefaultTLSConfig sets sane defaults to use when configuring the internal // webserver to listen for public connections. @@ -122,27 +122,27 @@ type RemoteQueryConfiguration struct { // SystemConfiguration defines basic system configuration settings. type SystemConfiguration struct { - // The root directory where all of the pterodactyl data is stored at. - RootDirectory string `default:"/var/lib/pterodactyl" yaml:"root_directory"` + // The root directory where all of the pelican data is stored at. + RootDirectory string `default:"/var/lib/pelican" yaml:"root_directory"` // Directory where logs for server installations and other wings events are logged. - LogDirectory string `default:"/var/log/pterodactyl" yaml:"log_directory"` + LogDirectory string `default:"/var/log/pelican" yaml:"log_directory"` // Directory where the server data is stored at. - Data string `default:"/var/lib/pterodactyl/volumes" yaml:"data"` + Data string `default:"/var/lib/pelican/volumes" yaml:"data"` // Directory where server archives for transferring will be stored. - ArchiveDirectory string `default:"/var/lib/pterodactyl/archives" yaml:"archive_directory"` + ArchiveDirectory string `default:"/var/lib/pelican/archives" yaml:"archive_directory"` // Directory where local backups will be stored on the machine. - BackupDirectory string `default:"/var/lib/pterodactyl/backups" yaml:"backup_directory"` + BackupDirectory string `default:"/var/lib/pelican/backups" yaml:"backup_directory"` - // TmpDirectory specifies where temporary files for Pterodactyl installation processes + // TmpDirectory specifies where temporary files for Pelican installation processes // should be created. This supports environments running docker-in-docker. - TmpDirectory string `default:"/tmp/pterodactyl" yaml:"tmp_directory"` + TmpDirectory string `default:"/tmp/pelican" yaml:"tmp_directory"` // The user that should own all of the server files, and be used for containers. - Username string `default:"pterodactyl" yaml:"username"` + Username string `default:"pelican" yaml:"username"` // The timezone for this Wings instance. This is detected by Wings automatically if possible, // and falls back to UTC if not able to be detected. If you need to set this manually, that @@ -283,7 +283,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:"Pelican" json:"app_name" yaml:"app_name"` // A unique identifier for this node in the Panel. Uuid string @@ -425,14 +425,14 @@ func WriteToDisk(c *Configuration) error { return nil } -// EnsurePterodactylUser ensures that the Pterodactyl core user exists on the +// EnsurePelicanUser ensures that the Pelican core user exists on the // system. This user will be the owner of all data in the root data directory // and is used as the user within containers. If files are not owned by this // user there will be issues with permissions on Docker mount points. // // This function IS NOT thread safe and should only be called in the main thread // when the application is booting. -func EnsurePterodactylUser() error { +func EnsurePelicanUser() error { sysName, err := getSystemName() if err != nil { return err @@ -440,7 +440,7 @@ func EnsurePterodactylUser() error { // Our way of detecting if wings is running inside of Docker. if sysName == "distroless" { - _config.System.Username = system.FirstNotEmpty(os.Getenv("WINGS_USERNAME"), "pterodactyl") + _config.System.Username = system.FirstNotEmpty(os.Getenv("WINGS_USERNAME"), "pelican") _config.System.User.Uid = system.MustInt(system.FirstNotEmpty(os.Getenv("WINGS_UID"), "988")) _config.System.User.Gid = system.MustInt(system.FirstNotEmpty(os.Getenv("WINGS_GID"), "988")) return nil @@ -458,7 +458,7 @@ func EnsurePterodactylUser() error { return nil } - log.WithField("username", _config.System.Username).Info("checking for pterodactyl system user") + log.WithField("username", _config.System.Username).Info("checking for pelican system user") u, err := user.Lookup(_config.System.Username) // If an error is returned but it isn't the unknown user error just abort // the process entirely. If we did find a user, return it immediately. diff --git a/config/config_docker.go b/config/config_docker.go index 74bfdafe..08935217 100644 --- a/config/config_docker.go +++ b/config/config_docker.go @@ -31,10 +31,10 @@ type DockerNetworkConfiguration struct { // The name of the network to use. If this network already exists it will not // be created. If it is not found, a new network will be created using the interface // defined. - Name string `default:"pterodactyl_nw"` + Name string `default:"pelican_nw"` ISPN bool `default:"false" yaml:"ispn"` Driver string `default:"bridge"` - Mode string `default:"pterodactyl_nw" yaml:"network_mode"` + Mode string `default:"pelican_nw" yaml:"network_mode"` IsInternal bool `default:"false" yaml:"is_internal"` EnableICC bool `default:"true" yaml:"enable_icc"` NetworkMTU int64 `default:"1500" yaml:"network_mtu"` @@ -84,7 +84,7 @@ type DockerConfiguration struct { // enabled. // // If the value is blank, the daemon's user namespace remapping configuration is used, - // if the value is "host", then the pterodactyl containers are started with user namespace + // if the value is "host", then the pelican containers are started with user namespace // remapping disabled UsernsMode string `default:"" json:"userns_mode" yaml:"userns_mode"` diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 8a6f57cb..372271a7 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -2,7 +2,7 @@ version: '3.8' services: wings: - image: ghcr.io/pterodactyl/wings:latest + image: ghcr.io/pelican-dev/wings:latest restart: always networks: - wings0 @@ -14,14 +14,14 @@ services: TZ: "UTC" WINGS_UID: 988 WINGS_GID: 988 - WINGS_USERNAME: pterodactyl + WINGS_USERNAME: pelican volumes: - "/var/run/docker.sock:/var/run/docker.sock" - "/var/lib/docker/containers/:/var/lib/docker/containers/" - - "/etc/pterodactyl/:/etc/pterodactyl/" - - "/var/lib/pterodactyl/:/var/lib/pterodactyl/" - - "/var/log/pterodactyl/:/var/log/pterodactyl/" - - "/tmp/pterodactyl/:/tmp/pterodactyl/" + - "/etc/pelican/:/etc/pelican/" + - "/var/lib/pelican/:/var/lib/pelican/" + - "/var/log/pelican/:/var/log/pelican/" + - "/tmp/pelican/:/tmp/pelican/" - "/etc/ssl/certs:/etc/ssl/certs:ro" # you may need /srv/daemon-data if you are upgrading from an old daemon #- "/srv/daemon-data/:/srv/daemon-data/" diff --git a/environment/allocations.go b/environment/allocations.go index e55a2b88..c05cc96f 100644 --- a/environment/allocations.go +++ b/environment/allocations.go @@ -6,7 +6,7 @@ import ( "github.com/docker/go-connections/nat" - "github.com/pterodactyl/wings/config" + "github.com/pelican-dev/wings/config" ) // Defines the allocations available for a given server. When using the Docker environment @@ -62,14 +62,14 @@ func (a *Allocations) Bindings() nat.PortMap { } // Returns the bindings for the server in a way that is supported correctly by Docker. This replaces -// any reference to 127.0.0.1 with the IP of the pterodactyl0 network interface which will allow the +// any reference to 127.0.0.1 with the IP of the pelican0 network interface which will allow the // server to operate on a local address while still being accessible by other containers. func (a *Allocations) DockerBindings() nat.PortMap { iface := config.Get().Docker.Network.Interface out := a.Bindings() // Loop over all the bindings for this container, and convert any that reference 127.0.0.1 - // to use the pterodactyl0 network interface IP, as that is the true local for what people are + // to use the pelican0 network interface IP, as that is the true local for what people are // trying to do when creating servers. for p, binds := range out { for i, alloc := range binds { diff --git a/environment/docker.go b/environment/docker.go index cbecbc31..1f61d8f7 100644 --- a/environment/docker.go +++ b/environment/docker.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" - "github.com/pterodactyl/wings/config" + "github.com/pelican-dev/wings/config" ) var ( @@ -45,7 +45,7 @@ func ConfigureDocker(ctx context.Context) error { return err } - log.Info("creating missing pterodactyl0 interface, this could take a few seconds...") + log.Info("creating missing pelican0 interface, this could take a few seconds...") if err := createDockerNetwork(ctx, cli); err != nil { return err } @@ -91,7 +91,7 @@ func createDockerNetwork(ctx context.Context, cli *client.Client) error { "com.docker.network.bridge.enable_icc": strconv.FormatBool(nw.EnableICC), "com.docker.network.bridge.enable_ip_masquerade": "true", "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0", - "com.docker.network.bridge.name": "pterodactyl0", + "com.docker.network.bridge.name": "pelican0", "com.docker.network.driver.mtu": strconv.FormatInt(nw.NetworkMTU, 10), }, }) diff --git a/environment/docker/api.go b/environment/docker/api.go index 8afdc188..e2c17dee 100644 --- a/environment/docker/api.go +++ b/environment/docker/api.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/goccy/go-json" - "github.com/pterodactyl/wings/config" + "github.com/pelican-dev/wings/config" ) var ( diff --git a/environment/docker/container.go b/environment/docker/container.go index 35b6e58e..c986ebd6 100644 --- a/environment/docker/container.go +++ b/environment/docker/container.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/system" ) var ErrNotAttached = errors.Sentinel("not attached to instance") @@ -155,7 +155,7 @@ func (e *Environment) Create() error { a := e.Configuration.Allocations() evs := e.Configuration.EnvironmentVariables() for i, v := range evs { - // Convert 127.0.0.1 to the pterodactyl0 network interface if the environment is Docker + // Convert 127.0.0.1 to the pelican0 network interface if the environment is Docker // so that the server operates as expected. if v == "SERVER_IP=127.0.0.1" { evs[i] = "SERVER_IP=" + cfg.Docker.Network.Interface @@ -169,7 +169,7 @@ func (e *Environment) Create() error { for key := range confLabels { labels[key] = confLabels[key] } - labels["Service"] = "Pterodactyl" + labels["Service"] = "Pelican" labels["ContainerType"] = "server_process" conf := &container.Config{ @@ -281,7 +281,7 @@ func (e *Environment) Destroy() error { // Don't trigger a destroy failure if we try to delete a container that does not // exist on the system. We're just a step ahead of ourselves in that case. // - // @see https://github.com/pterodactyl/panel/issues/2001 + // @see https://github.com/pelican-dev/panel/issues/2001 if err != nil && client.IsErrNotFound(err) { return nil } diff --git a/environment/docker/environment.go b/environment/docker/environment.go index 47f2d338..1e6e208e 100644 --- a/environment/docker/environment.go +++ b/environment/docker/environment.go @@ -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/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/events" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/system" ) type Metadata struct { @@ -157,7 +157,7 @@ func (e *Environment) ExitState() (uint32, bool, error) { // so I guess this should prevent it? They didn't tell me how they caused it though // so that's a mystery that will have to go unsolved. // - // @see https://github.com/pterodactyl/panel/issues/2003 + // @see https://github.com/pelican-dev/panel/issues/2003 if client.IsErrNotFound(err) { return 1, false, nil } diff --git a/environment/docker/power.go b/environment/docker/power.go index 6739d2ff..61f2a3eb 100644 --- a/environment/docker/power.go +++ b/environment/docker/power.go @@ -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/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/remote" ) // OnBeforeStart run before the container starts and get the process @@ -71,7 +71,7 @@ func (e *Environment) Start(ctx context.Context) error { // to the next block of code here. This check was inlined here to guard against // a nil-pointer when checking c.State below. // - // @see https://github.com/pterodactyl/panel/issues/2000 + // @see https://github.com/pelican-dev/panel/issues/2000 if !client.IsErrNotFound(err) { return errors.WrapIf(err, "environment/docker: failed to inspect container") } diff --git a/environment/docker/stats.go b/environment/docker/stats.go index 41da4cf2..9d6d205e 100644 --- a/environment/docker/stats.go +++ b/environment/docker/stats.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types" "github.com/goccy/go-json" - "github.com/pterodactyl/wings/environment" + "github.com/pelican-dev/wings/environment" ) // Uptime returns the current uptime of the container in milliseconds. If the diff --git a/environment/environment.go b/environment/environment.go index 2d038374..4394108f 100644 --- a/environment/environment.go +++ b/environment/environment.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/pterodactyl/wings/events" + "github.com/pelican-dev/wings/events" ) const ( diff --git a/environment/settings.go b/environment/settings.go index def91f62..cfb69e15 100644 --- a/environment/settings.go +++ b/environment/settings.go @@ -8,7 +8,7 @@ import ( "github.com/apex/log" "github.com/docker/docker/api/types/container" - "github.com/pterodactyl/wings/config" + "github.com/pelican-dev/wings/config" ) type Mount struct { @@ -115,7 +115,7 @@ func (l Limits) AsContainerResources() container.Resources { // If the CPU Limit is not set, don't send any of these fields through. Providing // them seems to break some Java services that try to read the available processors. // - // @see https://github.com/pterodactyl/panel/issues/3988 + // @see https://github.com/pelican-dev/panel/issues/3988 if l.CpuLimit > 0 { resources.CPUQuota = l.CpuLimit * 1_000 resources.CPUPeriod = 100_000 diff --git a/events/events.go b/events/events.go index e6c026c3..e9620282 100644 --- a/events/events.go +++ b/events/events.go @@ -6,7 +6,7 @@ import ( "emperror.dev/errors" "github.com/goccy/go-json" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/system" ) // Event represents an Event sent over a Bus. diff --git a/go.mod b/go.mod index 9f2c527b..d255572c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pterodactyl/wings +module github.com/pelican-dev/wings go 1.21 diff --git a/internal/cron/activity_cron.go b/internal/cron/activity_cron.go index 32210496..1f68e9d4 100644 --- a/internal/cron/activity_cron.go +++ b/internal/cron/activity_cron.go @@ -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/pelican-dev/wings/internal/database" + "github.com/pelican-dev/wings/internal/models" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/system" ) type activityCron struct { diff --git a/internal/cron/cron.go b/internal/cron/cron.go index fed4c04c..c76675cb 100644 --- a/internal/cron/cron.go +++ b/internal/cron/cron.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/system" ) const ErrCronRunning = errors.Sentinel("cron: job already running") diff --git a/internal/cron/sftp_cron.go b/internal/cron/sftp_cron.go index 239e014e..2d7956cc 100644 --- a/internal/cron/sftp_cron.go +++ b/internal/cron/sftp_cron.go @@ -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/pelican-dev/wings/internal/database" + "github.com/pelican-dev/wings/internal/models" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/system" ) type sftpCron struct { diff --git a/internal/database/database.go b/internal/database/database.go index 3fd68201..5e76c4bc 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/internal/models" + "github.com/pelican-dev/wings/system" ) var ( diff --git a/internal/progress/progress.go b/internal/progress/progress.go index 0e219aff..30e4c0a2 100644 --- a/internal/progress/progress.go +++ b/internal/progress/progress.go @@ -5,7 +5,7 @@ import ( "strings" "sync/atomic" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/system" ) // Progress is used to track the progress of any I/O operation that are being diff --git a/internal/progress/progress_test.go b/internal/progress/progress_test.go index 98037f5b..8d8ef8ba 100644 --- a/internal/progress/progress_test.go +++ b/internal/progress/progress_test.go @@ -6,7 +6,7 @@ import ( "github.com/franela/goblin" - "github.com/pterodactyl/wings/internal/progress" + "github.com/pelican-dev/wings/internal/progress" ) func TestProgress(t *testing.T) { diff --git a/internal/ufs/fs_unix_test.go b/internal/ufs/fs_unix_test.go index 3cf3b377..615c7eb2 100644 --- a/internal/ufs/fs_unix_test.go +++ b/internal/ufs/fs_unix_test.go @@ -11,7 +11,7 @@ import ( "path/filepath" "testing" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/internal/ufs" ) type testUnixFS struct { diff --git a/internal/ufs/walk_unix.go b/internal/ufs/walk_unix.go index 8472edf2..d78b6b4a 100644 --- a/internal/ufs/walk_unix.go +++ b/internal/ufs/walk_unix.go @@ -72,7 +72,7 @@ func (fs *UnixFS) walkDir(b []byte, parentfd int, name, relative string, d DirEn // relative to the root of the filesystem instead of from where the walk // was initiated from. // - // ref; https://github.com/pterodactyl/panel/issues/5030 + // ref; https://github.com/pelican-dev/panel/issues/5030 if err := fs.walkDir(b, dirfd, d1.Name(), path.Join(relative, d1.Name()), d1, walkDirFn); err != nil { if err == SkipDir { break diff --git a/loggers/cli/cli.go b/loggers/cli/cli.go index d2e425dc..862b58e1 100644 --- a/loggers/cli/cli.go +++ b/loggers/cli/cli.go @@ -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/pelican-dev/wings/server/filesystem.(*Archive).addToArchive + // github.com/pelican-dev/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/pelican-dev/wings/server.(*Server).Backup + // github.com/pelican-dev/wings/server/backup.go:84 // ... (Truncated the stack for easier reading) // runtime.goexit // runtime/asm_amd64.s:1374 diff --git a/parser/parser.go b/parser/parser.go index ae582708..d5f56572 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -17,8 +17,8 @@ import ( "gopkg.in/ini.v1" "gopkg.in/yaml.v3" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/internal/ufs" ) // The file parsing options that are available for a server configuration file. @@ -516,8 +516,8 @@ func (f *ConfigurationFile) parseTextFile(file ufs.File) error { // the value was escaped or not to begin with before setting it, which I suppose // can work but jesus that is going to be some annoyingly complicated logic? // -// @see https://github.com/pterodactyl/panel/issues/2308 (original) -// @see https://github.com/pterodactyl/panel/issues/3009 ("bug" introduced as result) +// @see https://github.com/pelican-dev/panel/issues/2308 (original) +// @see https://github.com/pelican-dev/panel/issues/3009 ("bug" introduced as result) func (f *ConfigurationFile) parsePropertiesFile(file ufs.File) error { b, err := io.ReadAll(file) if err != nil { diff --git a/remote/http.go b/remote/http.go index 7812799d..f3fdefcf 100644 --- a/remote/http.go +++ b/remote/http.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "github.com/pterodactyl/wings/internal/models" + "github.com/pelican-dev/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/pelican-dev/wings/system" ) type Client interface { @@ -105,8 +105,8 @@ func (c *client) requestOnce(ctx context.Context, method, path string, body io.R return nil, err } - req.Header.Set("User-Agent", fmt.Sprintf("Pterodactyl Wings/v%s (id:%s)", system.Version, c.tokenId)) - req.Header.Set("Accept", "application/vnd.pterodactyl.v1+json") + req.Header.Set("User-Agent", fmt.Sprintf("Pelican Wings/v%s (id:%s)", system.Version, c.tokenId)) + req.Header.Set("Accept", "application/vnd.pelican.v1+json") req.Header.Set("Content-Type", "application/json") req.Header.Set("Authorization", fmt.Sprintf("Bearer %s.%s", c.tokenId, c.token)) diff --git a/remote/http_test.go b/remote/http_test.go index 9e16d445..1027057d 100644 --- a/remote/http_test.go +++ b/remote/http_test.go @@ -23,7 +23,7 @@ func createTestClient(h http.HandlerFunc) (*client, *httptest.Server) { func TestRequest(t *testing.T) { c, _ := createTestClient(func(rw http.ResponseWriter, r *http.Request) { - assert.Equal(t, "application/vnd.pterodactyl.v1+json", r.Header.Get("Accept")) + assert.Equal(t, "application/vnd.pelican.v1+json", r.Header.Get("Accept")) assert.Equal(t, "application/json", r.Header.Get("Content-Type")) assert.Equal(t, "Bearer testid.testtoken", r.Header.Get("Authorization")) assert.Equal(t, "/test", r.URL.Path) diff --git a/remote/servers.go b/remote/servers.go index 922d2c76..ff746662 100644 --- a/remote/servers.go +++ b/remote/servers.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "github.com/pterodactyl/wings/internal/models" + "github.com/pelican-dev/wings/internal/models" "emperror.dev/errors" "github.com/apex/log" diff --git a/remote/types.go b/remote/types.go index f636730e..9999884a 100644 --- a/remote/types.go +++ b/remote/types.go @@ -8,7 +8,7 @@ import ( "github.com/apex/log" "github.com/goccy/go-json" - "github.com/pterodactyl/wings/parser" + "github.com/pelican-dev/wings/parser" ) const ( diff --git a/router/downloader/downloader.go b/router/downloader/downloader.go index d5436d63..c18904ac 100644 --- a/router/downloader/downloader.go +++ b/router/downloader/downloader.go @@ -17,7 +17,7 @@ import ( "github.com/goccy/go-json" "github.com/google/uuid" - "github.com/pterodactyl/wings/server" + "github.com/pelican-dev/wings/server" ) var client = &http.Client{ @@ -157,7 +157,7 @@ func (dl *Download) Execute() error { return errors.WrapIf(err, "downloader: failed to create request") } - req.Header.Set("User-Agent", "Pterodactyl Panel (https://pterodactyl.io)") + req.Header.Set("User-Agent", "Pelican Panel (https://pelican.io)") res, err := client.Do(req) if err != nil { return ErrDownloadFailed diff --git a/router/middleware.go b/router/middleware.go index 20f32d76..cc6bc873 100644 --- a/router/middleware.go +++ b/router/middleware.go @@ -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/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/server" ) // ExtractServer returns the server instance from the gin context. If there is diff --git a/router/middleware/middleware.go b/router/middleware/middleware.go index cd37a9e5..48acb405 100644 --- a/router/middleware/middleware.go +++ b/router/middleware/middleware.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server" ) // AttachRequestID attaches a unique ID to the incoming HTTP request so that any diff --git a/router/middleware/request_error.go b/router/middleware/request_error.go index 9ac6fd25..030b35e5 100644 --- a/router/middleware/request_error.go +++ b/router/middleware/request_error.go @@ -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/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/filesystem" ) // RequestError is a custom error type returned when something goes wrong with diff --git a/router/router.go b/router/router.go index d748e27b..924b06c6 100644 --- a/router/router.go +++ b/router/router.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/router/middleware" + wserver "github.com/pelican-dev/wings/server" ) // Configure configures the routing infrastructure for this daemon instance. diff --git a/router/router_download.go b/router/router_download.go index 178484da..0cdf3fde 100644 --- a/router/router_download.go +++ b/router/router_download.go @@ -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/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/router/tokens" + "github.com/pelican-dev/wings/server/backup" ) // Handle a download request for a server backup. diff --git a/router/router_server.go b/router/router_server.go index 9812df75..6f1efcb0 100644 --- a/router/router_server.go +++ b/router/router_server.go @@ -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/pelican-dev/wings/router/downloader" + "github.com/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/router/tokens" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/transfer" ) // Returns a single server from the collection of servers. diff --git a/router/router_server_backup.go b/router/router_server_backup.go index 4c3d337e..7a23179d 100644 --- a/router/router_server_backup.go +++ b/router/router_server_backup.go @@ -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/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/backup" ) // postServerBackup performs a backup against a given server instance using the diff --git a/router/router_server_files.go b/router/router_server_files.go index 09ad8cd1..78598e7b 100644 --- a/router/router_server_files.go +++ b/router/router_server_files.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/internal/models" + "github.com/pelican-dev/wings/router/downloader" + "github.com/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/router/tokens" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/filesystem" ) // getServerFileContents returns the contents of a file on the server. @@ -39,7 +39,7 @@ func getServerFileContents(c *gin.Context) { defer f.Close() // Don't allow a named pipe to be opened. // - // @see https://github.com/pterodactyl/panel/issues/4059 + // @see https://github.com/pelican-dev/panel/issues/4059 if st.Mode()&os.ModeNamedPipe != 0 { c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{ "error": "Cannot open files of this type.", @@ -63,7 +63,7 @@ func getServerFileContents(c *gin.Context) { // // "http: wrote more than the declared Content-Length" // - // @see https://github.com/pterodactyl/panel/issues/3131 + // @see https://github.com/pelican-dev/panel/issues/3131 r := io.LimitReader(f, st.Size()) if _, err = bufio.NewReader(r).WriteTo(c.Writer); err != nil { // Pretty sure this will unleash chaos on the response, but its a risk we can diff --git a/router/router_server_transfer.go b/router/router_server_transfer.go index 8c9c5c47..656b84fe 100644 --- a/router/router_server_transfer.go +++ b/router/router_server_transfer.go @@ -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/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/installer" + "github.com/pelican-dev/wings/server/transfer" ) // Data passed over to initiate a server transfer. diff --git a/router/router_server_ws.go b/router/router_server_ws.go index 8bb56e66..6835c769 100644 --- a/router/router_server_ws.go +++ b/router/router_server_ws.go @@ -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/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/router/websocket" ) var expectedCloseCodes = []int{ diff --git a/router/router_system.go b/router/router_system.go index 9dbe605e..02a929ae 100644 --- a/router/router_system.go +++ b/router/router_system.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/installer" + "github.com/pelican-dev/wings/system" ) // Returns information about the system that wings is running on. diff --git a/router/router_transfer.go b/router/router_transfer.go index 1b062b05..ddd4a8e2 100644 --- a/router/router_transfer.go +++ b/router/router_transfer.go @@ -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/pelican-dev/wings/router/middleware" + "github.com/pelican-dev/wings/router/tokens" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/installer" + "github.com/pelican-dev/wings/server/transfer" ) // postTransfers . diff --git a/router/tokens/parser.go b/router/tokens/parser.go index ad6ca649..ae16eba5 100644 --- a/router/tokens/parser.go +++ b/router/tokens/parser.go @@ -5,7 +5,7 @@ import ( "github.com/gbrlsnchs/jwt/v3" - "github.com/pterodactyl/wings/config" + "github.com/pelican-dev/wings/config" ) type TokenData interface { diff --git a/router/websocket/listeners.go b/router/websocket/listeners.go index 272c8aee..1bede063 100644 --- a/router/websocket/listeners.go +++ b/router/websocket/listeners.go @@ -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/pelican-dev/wings/events" + "github.com/pelican-dev/wings/system" - "github.com/pterodactyl/wings/server" + "github.com/pelican-dev/wings/server" ) // RegisterListenerEvents will setup the server event listeners and expiration @@ -23,7 +23,7 @@ import ( // Docker events being output to the socket will fail when it hasn't been // properly initialized yet. // -// @see https://github.com/pterodactyl/panel/issues/3295 +// @see https://github.com/pelican-dev/panel/issues/3295 func (h *Handler) registerListenerEvents(ctx context.Context) { h.Logger().Debug("registering event listeners for connection") diff --git a/router/websocket/websocket.go b/router/websocket/websocket.go index 95f56bdb..6f3aec6b 100644 --- a/router/websocket/websocket.go +++ b/router/websocket/websocket.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/pterodactyl/wings/internal/models" + "github.com/pelican-dev/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/pelican-dev/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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/environment/docker" + "github.com/pelican-dev/wings/router/tokens" + "github.com/pelican-dev/wings/server" ) const ( @@ -310,7 +310,7 @@ func (h *Handler) HandleInbound(ctx context.Context, m Message) error { // instead of authenticating for the first time. if !newConnection { // This prevents duplicate status messages as outlined in - // https://github.com/pterodactyl/panel/issues/2077 + // https://github.com/pelican-dev/panel/issues/2077 return nil } diff --git a/server/activity.go b/server/activity.go index c1613adb..290ae7ce 100644 --- a/server/activity.go +++ b/server/activity.go @@ -6,8 +6,8 @@ import ( "emperror.dev/errors" - "github.com/pterodactyl/wings/internal/database" - "github.com/pterodactyl/wings/internal/models" + "github.com/pelican-dev/wings/internal/database" + "github.com/pelican-dev/wings/internal/models" ) const ActivityPowerPrefix = "server:power." diff --git a/server/backup.go b/server/backup.go index 1568290d..9065e41a 100644 --- a/server/backup.go +++ b/server/backup.go @@ -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/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server/backup" ) // Notifies the panel of a backup's state and returns an error if one is encountered diff --git a/server/backup/backup.go b/server/backup/backup.go index 34e8c17e..a00d01c7 100644 --- a/server/backup/backup.go +++ b/server/backup/backup.go @@ -14,9 +14,9 @@ import ( "github.com/mholt/archiver/v4" "golang.org/x/sync/errgroup" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/remote" - "github.com/pterodactyl/wings/server/filesystem" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server/filesystem" ) var format = archiver.CompressedArchive{ diff --git a/server/backup/backup_local.go b/server/backup/backup_local.go index f56adec8..4a30a40f 100644 --- a/server/backup/backup_local.go +++ b/server/backup/backup_local.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server/filesystem" ) type LocalBackup struct { diff --git a/server/backup/backup_s3.go b/server/backup/backup_s3.go index 299509bf..dafd2ccc 100644 --- a/server/backup/backup_s3.go +++ b/server/backup/backup_s3.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server/filesystem" ) type S3Backup struct { diff --git a/server/config_parser.go b/server/config_parser.go index f7f23023..6d982bd3 100644 --- a/server/config_parser.go +++ b/server/config_parser.go @@ -5,7 +5,7 @@ import ( "github.com/gammazero/workerpool" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/internal/ufs" ) // UpdateConfigurationFiles updates all the defined configuration files for diff --git a/server/configuration.go b/server/configuration.go index 387aba8b..d29dc6cf 100644 --- a/server/configuration.go +++ b/server/configuration.go @@ -3,7 +3,7 @@ package server import ( "sync" - "github.com/pterodactyl/wings/environment" + "github.com/pelican-dev/wings/environment" ) type EggConfiguration struct { diff --git a/server/console.go b/server/console.go index 0cd2ff66..d61f5f09 100644 --- a/server/console.go +++ b/server/console.go @@ -7,8 +7,8 @@ import ( "github.com/mitchellh/colorstring" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/system" ) // appName is a local cache variable to avoid having to make expensive copies of diff --git a/server/crash.go b/server/crash.go index 3439c4af..afcf3655 100644 --- a/server/crash.go +++ b/server/crash.go @@ -8,8 +8,8 @@ import ( "emperror.dev/errors" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/environment" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" ) type CrashHandler struct { diff --git a/server/events.go b/server/events.go index d08411cc..8253dc43 100644 --- a/server/events.go +++ b/server/events.go @@ -1,8 +1,8 @@ package server import ( - "github.com/pterodactyl/wings/events" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/events" + "github.com/pelican-dev/wings/system" ) // Defines all the possible output events for a server. diff --git a/server/filesystem/archive.go b/server/filesystem/archive.go index 16ae7f9e..bfaf5788 100644 --- a/server/filesystem/archive.go +++ b/server/filesystem/archive.go @@ -16,9 +16,9 @@ import ( "github.com/klauspost/pgzip" ignore "github.com/sabhiram/go-gitignore" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/internal/progress" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/internal/progress" + "github.com/pelican-dev/wings/internal/ufs" ) const memory = 4 * 1024 @@ -212,7 +212,7 @@ func (a *Archive) callback(opts ...walkFunc) walkFunc { // If base isn't empty, strip it from the relative path. This fixes an // issue when creating an archive starting from a nested directory. // - // See https://github.com/pterodactyl/panel/issues/5030 for more details. + // See https://github.com/pelican-dev/panel/issues/5030 for more details. if base != "" { relative = strings.TrimPrefix(relative, base) } diff --git a/server/filesystem/compress.go b/server/filesystem/compress.go index bcf2873f..15f2d26e 100644 --- a/server/filesystem/compress.go +++ b/server/filesystem/compress.go @@ -15,8 +15,8 @@ import ( "github.com/klauspost/compress/zip" "github.com/mholt/archiver/v4" - "github.com/pterodactyl/wings/internal/ufs" - "github.com/pterodactyl/wings/server/filesystem/archiverext" + "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican-dev/wings/server/filesystem/archiverext" ) // CompressFiles compresses all the files matching the given paths in the diff --git a/server/filesystem/disk_space.go b/server/filesystem/disk_space.go index eb8247ac..48243800 100644 --- a/server/filesystem/disk_space.go +++ b/server/filesystem/disk_space.go @@ -8,7 +8,7 @@ import ( "emperror.dev/errors" "github.com/apex/log" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/internal/ufs" ) type SpaceCheckingOpts struct { @@ -181,7 +181,7 @@ func (fs *Filesystem) DirectorySize(root string) (int64, error) { } // TODO: detect if info is a hard-link and de-duplicate it. - // ref; https://github.com/pterodactyl/wings/pull/181/files + // ref; https://github.com/pelican-dev/wings/pull/181/files size.Add(info.Size()) return nil diff --git a/server/filesystem/errors.go b/server/filesystem/errors.go index b977fe6b..c3676dd0 100644 --- a/server/filesystem/errors.go +++ b/server/filesystem/errors.go @@ -7,7 +7,7 @@ import ( "emperror.dev/errors" "github.com/apex/log" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/internal/ufs" ) type ErrorCode string diff --git a/server/filesystem/filesystem.go b/server/filesystem/filesystem.go index bfd49bc3..845935f5 100644 --- a/server/filesystem/filesystem.go +++ b/server/filesystem/filesystem.go @@ -17,8 +17,8 @@ import ( "github.com/gabriel-vasile/mimetype" ignore "github.com/sabhiram/go-gitignore" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/internal/ufs" ) type Filesystem struct { diff --git a/server/filesystem/filesystem_test.go b/server/filesystem/filesystem_test.go index e5c6e613..0366dfc8 100644 --- a/server/filesystem/filesystem_test.go +++ b/server/filesystem/filesystem_test.go @@ -12,9 +12,9 @@ import ( . "github.com/franela/goblin" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/internal/ufs" - "github.com/pterodactyl/wings/config" + "github.com/pelican-dev/wings/config" ) func NewFs() (*Filesystem, *rootFs) { @@ -26,7 +26,7 @@ func NewFs() (*Filesystem, *rootFs) { }, }) - tmpDir, err := os.MkdirTemp(os.TempDir(), "pterodactyl") + tmpDir, err := os.MkdirTemp(os.TempDir(), "pelican") if err != nil { panic(err) return nil, nil diff --git a/server/filesystem/path_test.go b/server/filesystem/path_test.go index 4d46fbf4..098588f5 100644 --- a/server/filesystem/path_test.go +++ b/server/filesystem/path_test.go @@ -9,7 +9,7 @@ import ( "emperror.dev/errors" . "github.com/franela/goblin" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/internal/ufs" ) func TestFilesystem_Path(t *testing.T) { diff --git a/server/filesystem/stat.go b/server/filesystem/stat.go index 9d446beb..f4a2eadf 100644 --- a/server/filesystem/stat.go +++ b/server/filesystem/stat.go @@ -8,7 +8,7 @@ import ( "github.com/gabriel-vasile/mimetype" - "github.com/pterodactyl/wings/internal/ufs" + "github.com/pelican-dev/wings/internal/ufs" ) type Stat struct { diff --git a/server/install.go b/server/install.go index f6f95850..89fd99b4 100644 --- a/server/install.go +++ b/server/install.go @@ -18,10 +18,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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/system" ) // Install executes the installation stack for a server process. Bubbles any @@ -353,7 +353,7 @@ func (ip *InstallationProcess) AfterExecute(containerId string) error { // variables passed into the container to make debugging things a little easier. ip.Server.Log().WithField("path", ip.GetLogPath()).Debug("writing most recent installation logs to disk") - tmpl, err := template.New("header").Parse(`Pterodactyl Server Installation Log + tmpl, err := template.New("header").Parse(`Pelican Server Installation Log | | Details @@ -407,7 +407,7 @@ func (ip *InstallationProcess) Execute() (string, error) { Image: ip.Script.ContainerImage, Env: ip.Server.GetEnvironmentVariables(), Labels: map[string]string{ - "Service": "Pterodactyl", + "Service": "Pelican", "ContainerType": "server_installer", }, } diff --git a/server/installer/installer.go b/server/installer/installer.go index f414918c..3da4bd97 100644 --- a/server/installer/installer.go +++ b/server/installer/installer.go @@ -6,8 +6,8 @@ import ( "emperror.dev/errors" "github.com/asaskevich/govalidator" - "github.com/pterodactyl/wings/remote" - "github.com/pterodactyl/wings/server" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server" ) type Installer struct { diff --git a/server/listeners.go b/server/listeners.go index d39e6649..c959cf98 100644 --- a/server/listeners.go +++ b/server/listeners.go @@ -9,11 +9,11 @@ import ( "github.com/apex/log" - "github.com/pterodactyl/wings/events" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/events" + "github.com/pelican-dev/wings/system" - "github.com/pterodactyl/wings/environment" - "github.com/pterodactyl/wings/remote" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/remote" ) var dockerEvents = []string{ diff --git a/server/manager.go b/server/manager.go index 6482f633..55dd645e 100644 --- a/server/manager.go +++ b/server/manager.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/environment/docker" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server/filesystem" ) type Manager struct { diff --git a/server/mounts.go b/server/mounts.go index 97c80946..a4269ebb 100644 --- a/server/mounts.go +++ b/server/mounts.go @@ -6,8 +6,8 @@ import ( "github.com/apex/log" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/environment" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" ) // To avoid confusion when working with mounts, assume that a server.Mount has not been properly diff --git a/server/power.go b/server/power.go index f927cebf..62171eb6 100644 --- a/server/power.go +++ b/server/power.go @@ -9,8 +9,8 @@ import ( "emperror.dev/errors" "github.com/google/uuid" - "github.com/pterodactyl/wings/config" - "github.com/pterodactyl/wings/environment" + "github.com/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" ) type PowerAction string diff --git a/server/power_test.go b/server/power_test.go index 3aa993bb..b3ff9dc8 100644 --- a/server/power_test.go +++ b/server/power_test.go @@ -5,7 +5,7 @@ import ( . "github.com/franela/goblin" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/system" ) func TestPower(t *testing.T) { diff --git a/server/resources.go b/server/resources.go index e11adf59..7da1181e 100644 --- a/server/resources.go +++ b/server/resources.go @@ -4,8 +4,8 @@ import ( "sync" "sync/atomic" - "github.com/pterodactyl/wings/environment" - "github.com/pterodactyl/wings/system" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/system" ) // ResourceUsage defines the current resource usage for a given server instance. If a server is offline you diff --git a/server/server.go b/server/server.go index 18c10e24..c1c8e8d2 100644 --- a/server/server.go +++ b/server/server.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/environment" + "github.com/pelican-dev/wings/events" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican-dev/wings/system" ) // Server is the high level definition for a server instance being controlled @@ -50,7 +50,7 @@ type Server struct { emitter *events.Bus // Defines the process configuration for the server instance. This is dynamically - // fetched from the Pterodactyl Server instance each time the server process is + // fetched from the Pelican Server instance each time the server process is // started, and then cached here. procConfig *remote.ProcessConfiguration diff --git a/server/transfer/archive.go b/server/transfer/archive.go index 26cfddca..bb144c69 100644 --- a/server/transfer/archive.go +++ b/server/transfer/archive.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/pterodactyl/wings/internal/progress" - "github.com/pterodactyl/wings/server/filesystem" + "github.com/pelican-dev/wings/internal/progress" + "github.com/pelican-dev/wings/server/filesystem" ) // Archive returns an archive that can be used to stream the contents of the diff --git a/server/transfer/source.go b/server/transfer/source.go index cdcceec1..bf6a9d3e 100644 --- a/server/transfer/source.go +++ b/server/transfer/source.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - "github.com/pterodactyl/wings/internal/progress" + "github.com/pelican-dev/wings/internal/progress" ) // PushArchiveToTarget POSTs the archive to the target node and returns the diff --git a/server/transfer/transfer.go b/server/transfer/transfer.go index 6511cfc7..800dac6a 100644 --- a/server/transfer/transfer.go +++ b/server/transfer/transfer.go @@ -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/pelican-dev/wings/server" + "github.com/pelican-dev/wings/system" ) // Status represents the current status of a transfer. diff --git a/server/update.go b/server/update.go index c8a57bb5..62ba5c42 100644 --- a/server/update.go +++ b/server/update.go @@ -3,9 +3,9 @@ package server import ( "time" - "github.com/pterodactyl/wings/environment/docker" + "github.com/pelican-dev/wings/environment/docker" - "github.com/pterodactyl/wings/environment" + "github.com/pelican-dev/wings/environment" ) // SyncWithEnvironment updates the environment for the server to match any of @@ -41,7 +41,7 @@ func (s *Server) SyncWithEnvironment() { // If build limits are changed, environment variables also change. Plus, any modifications to // the startup command also need to be properly propagated to this environment. // - // @see https://github.com/pterodactyl/panel/issues/2255 + // @see https://github.com/pelican-dev/panel/issues/2255 s.Environment.Config().SetEnvironmentVariables(s.GetEnvironmentVariables()) if !s.IsSuspended() { diff --git a/sftp/event.go b/sftp/event.go index 2c4d85fa..040878cb 100644 --- a/sftp/event.go +++ b/sftp/event.go @@ -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/pelican-dev/wings/internal/database" + "github.com/pelican-dev/wings/internal/models" ) type eventHandler struct { diff --git a/sftp/handler.go b/sftp/handler.go index 74ba9eb6..dacea401 100644 --- a/sftp/handler.go +++ b/sftp/handler.go @@ -12,9 +12,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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/server" + "github.com/pelican-dev/wings/server/filesystem" ) const ( diff --git a/sftp/server.go b/sftp/server.go index 6b977030..101191d6 100644 --- a/sftp/server.go +++ b/sftp/server.go @@ -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/pelican-dev/wings/config" + "github.com/pelican-dev/wings/remote" + "github.com/pelican-dev/wings/server" ) // Usernames all follow the same format, so don't even bother hitting the API if the username is not diff --git a/wings.go b/wings.go index 2c19d2a2..ff04ba36 100644 --- a/wings.go +++ b/wings.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "github.com/pterodactyl/wings/cmd" + "github.com/pelican-dev/wings/cmd" ) func main() {