From 60087d451c43813ec9752ce4469d8d1207a0764c Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 22 Jul 2018 15:15:44 -0700 Subject: [PATCH] Actually get things working correctly --- Vagrantfile | 5 +++-- scripts/deploy_docs.sh | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index e9bb2e2..506c146 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -64,7 +64,8 @@ Vagrant.configure("2") do |config| docs.vm.synced_folder ".", "/vagrant", disabled: true docs.hostmanager.aliases = %w(pterodocs.local) - docs.vm.network "forwarded_port", guest: 80, host: 8088 + docs.vm.network "forwarded_port", guest: 80, host: 9090 + docs.vm.network "forwarded_port", guest: 9091, host: 9091 docs.ssh.insert_key = true docs.ssh.username = "root" @@ -73,7 +74,7 @@ Vagrant.configure("2") do |config| docs.vm.provider "docker" do |d| d.image = "quay.io/pterodactyl/vagrant-core" d.create_args = ["-it", "--add-host=host.pterodactyl.local:172.17.0.1"] - d.ports = ["8088:80"] + d.ports = ["8088:80", "9091:9091"] d.volumes = ["#{vagrant_root}/code/documentation:/srv/documentation:cached"] d.remains_running = true d.has_ssh = true diff --git a/scripts/deploy_docs.sh b/scripts/deploy_docs.sh index abee63f..2655bac 100644 --- a/scripts/deploy_docs.sh +++ b/scripts/deploy_docs.sh @@ -1,9 +1,11 @@ +apt -y update && apt -y install apt-transport-https + curl -sS 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 curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - # Install dependencies and start supervisor -apt install -y --no-install-recommends nodejs yarn supervisor +apt install -y --no-install-recommends nginx nodejs yarn supervisor /usr/bin/supervisord # Copy over deployment specific files. @@ -18,7 +20,7 @@ ln -s /srv/documentation ~/docs # Configure and restart nginx rm -rfv /var/www -rm -rv /etc/nginx/sites-enabled/* +rm -rfv /etc/nginx/sites-enabled/* ln -s /etc/nginx/sites-available/pterodocs.local.conf /etc/nginx/sites-enabled/pterodocs.local.conf supervisorctl reread