Add dlv, remove old daemon files

This commit is contained in:
Dane Everitt 2021-01-21 20:13:02 -08:00
parent 9664a6a632
commit 2abd129571
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
4 changed files with 6 additions and 60 deletions

15
Vagrantfile vendored
View File

@ -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

View File

@ -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."

View File

@ -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

View File

@ -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