From 2abd1295717c6a670a19b8b45dfe53e6ef725255 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 21 Jan 2021 20:13:02 -0800
Subject: [PATCH] Add dlv, remove old daemon files

---
 Vagrantfile                 | 17 +---------------
 scripts/provision_daemon.sh | 40 -------------------------------------
 scripts/provision_wings.sh  |  7 +++++--
 setup.sh                    |  2 --
 4 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 scripts/provision_daemon.sh

diff --git a/Vagrantfile b/Vagrantfile
index bc8b880..5516d34 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -40,7 +40,6 @@ Vagrant.configure("2") do |config|
 			d.create_args = [
 			    "-it",
 			    "--add-host=host.pterodactyl.test:172.17.0.1",
-				"--add-host=daemon.pterodactyl.test:192.168.50.4",
 				"--add-host=wings.pterodactyl.test:192.168.50.3",
 			]
 			d.ports = ["80:80", "443:443", "8080:8080", "8081:8081"]
@@ -101,20 +100,6 @@ Vagrant.configure("2") do |config|
 		config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
 	end
 
-	config.vm.define "daemon", autostart: false do |daemon|
-		daemon.vm.hostname = "daemon.pterodactyl.test"
-		daemon.vm.box = "bento/ubuntu-18.04"
-
-		daemon.vm.synced_folder ".", "/vagrant", disabled: true
-		daemon.vm.synced_folder "#{vagrant_root}/code/daemon", "/srv/daemon", owner: "vagrant", group: "vagrant"
-		daemon.vm.synced_folder "#{vagrant_root}/.data/certificates", "/etc/ssl/private", owner: "vagrant", group: "vagrant"
-		daemon.vm.synced_folder "#{vagrant_root}/code/sftp-server", "/home/vagrant/sftp-server", owner: "vagrant", group: "vagrant"
-
-		daemon.vm.network :private_network, ip: "192.168.50.4"
-
-		daemon.vm.provision "provision", type: "shell", path: "#{vagrant_root}/scripts/provision_daemon.sh"
-	end
-
 	config.vm.define "docs" do |docs|
 		docs.vm.hostname = "docs.pterodactyl.test"
 		docs.vm.synced_folder ".", "/vagrant", disabled: true
@@ -133,7 +118,7 @@ Vagrant.configure("2") do |config|
 			d.name = "pterodev_docs"
 
 			d.volumes = ["#{vagrant_root}/code/documentation:/home/vagrant/docs:cached"]
-			
+
 			d.remains_running = true
 			d.has_ssh = true
 			d.privileged = true
diff --git a/scripts/provision_daemon.sh b/scripts/provision_daemon.sh
deleted file mode 100644
index 3e419f2..0000000
--- a/scripts/provision_daemon.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-export DEBIAN_FRONTEND=noninteractive
-
-echo "Provisioning development environment for Pterodactyl Panel."
-
-echo "Add repositories"
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - > /dev/null
-add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" > /dev/null
-add-apt-repository -y ppa:longsleep/golang-backports > /dev/null
-curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - > /dev/null
-curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-apt-get update
-
-echo "Install everything"
-apt-get -y install nodejs yarn \
-    golang-go mercurial \
-    docker-ce docker-ce-cli containerd.io \
-    tar unzip make gcc g++ python > /dev/null
-
-systemctl enable docker
-systemctl start docker
-
-usermod -aG docker vagrant
-
-echo "Install ctop for fancy container monitoring"
-wget https://github.com/bcicen/ctop/releases/download/v0.7.2/ctop-0.7.2-linux-amd64 -q -O /usr/local/bin/ctop
-chmod +x /usr/local/bin/ctop
-
-echo "Setup GOPATH"
-echo "export GOPATH=/home/vagrant/go" >> /home/vagrant/.profile
-export GOPATH=/go
-echo 'export PATH=$PATH:$GOPATH/bin' >> /home/vagrant/.profile
-
-echo "Install nodejs dependencies"
-$(cd /srv/daemon && yarn install)
-
-echo "   ------------"
-echo "Provisioning is completed."
-echo "You'll still need to configure your node in the panel manually."
\ No newline at end of file
diff --git a/scripts/provision_wings.sh b/scripts/provision_wings.sh
index f6762e3..073b349 100644
--- a/scripts/provision_wings.sh
+++ b/scripts/provision_wings.sh
@@ -10,7 +10,10 @@ add-apt-repository ppa:longsleep/golang-backports
 
 # Perform the installation of the required software.
 apt -y update
-apt -y --no-install-recommends install tar zip unzip make gcc g++ python docker-ce docker-ce-cli containerd.io golang-go
+apt -y --no-install-recommends install tar zip unzip make gcc g++ gdb python docker-ce docker-ce-cli containerd.io golang-go
+
+# Install delve for Go debugging support.
+GOBIN=/usr/local/bin go get github.com/go-delve/delve/cmd/dlv
 
 # Configure the vagrant user to have permission to use Docker.
 usermod -aG docker vagrant
@@ -37,4 +40,4 @@ chown -R vagrant:vagrant /home/vagrant /etc/pterodactyl /var/log/pterodactyl
 # map pterodactyl.test to the host system
 echo "$(ip route | grep default | cut -d' ' -f3,3) pterodactyl.test" >> /etc/hosts
 
-echo "done."
\ No newline at end of file
+echo "done."
diff --git a/setup.sh b/setup.sh
index aaa4978..e29cf9f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,8 +11,6 @@ cd ${CURRENT_DIRECTORY}
 git clone https://github.com/pterodactyl/panel.git code/panel
 git clone https://github.com/pterodactyl/documentation.git code/documentation
 git clone https://github.com/pterodactyl/wings.git code/wings
-git clone https://github.com/pterodactyl/daemon.git code/daemon
-git clone https://github.com/pterodactyl/sftp-server.git code/sftp-server
 
 mkdir -p .data/certificates