pterodactyl/development
1
0
Fork 0
mirror of https://github.com/pterodactyl/development.git synced 2025-12-10 20:07:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

use .test as tld instead of .local

Browse Source 
because macOS treats every .local domain as a Bonjour host which delays
dns lookups
This commit is contained in:
Jakob Schrettenbrunner 2018-12-17 23:06:20 +01:00
parent 7187be4781
commit fb74162da2
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Vagrantfile vendored
View File

@ -18,7 +18,7 @@ Vagrant.configure("2") do |config|
app.vm.synced_folder ".", "/vagrant", disabled: true
app.hostmanager.aliases = %w(pterodactyl.local)
app.hostmanager.aliases = %w(pterodactyl.test)
app.vm.network "forwarded_port", guest: 80, host: 80
app.vm.network "forwarded_port", guest: 8080, host: 8080
@ -30,7 +30,7 @@ Vagrant.configure("2") do |config|
app.vm.provider "docker" do |d|
d.image = "quay.io/pterodactyl/vagrant-panel"
d.create_args = ["-it", "--add-host=host.pterodactyl.local:172.17.0.1"]
d.create_args = ["-it", "--add-host=host.pterodactyl.test:172.17.0.1"]
d.ports = ["80:80", "8080:8080", "8081:8081"]
if ENV['FILE_SYNC_METHOD'] === 'docker-sync'
@ -51,9 +51,9 @@ Vagrant.configure("2") do |config|
cp .env .env.bkup
php artisan key:generate --force --no-interaction
php artisan p:environment:setup --new-salt --author="you@example.com" --url="http://pterodactyl.local" --timezone="America/Los_Angeles" --cache=redis --session=redis --queue=redis --redis-host="host.pterodactyl.local" --no-interaction
php artisan p:environment:database --host="host.pterodactyl.local" --database=panel --username=pterodactyl --password=pterodactyl --no-interaction
php artisan p:environment:mail --driver=smtp --email="outgoing@example.com" --from="Pterodactyl Panel" --host="host.pterodactyl.local" --port=1025 --no-interaction
php artisan p:environment:setup --new-salt --author="you@example.com" --url="http://pterodactyl.test" --timezone="America/Los_Angeles" --cache=redis --session=redis --queue=redis --redis-host="host.pterodactyl.test" --no-interaction
php artisan p:environment:database --host="host.pterodactyl.test" --database=panel --username=pterodactyl --password=pterodactyl --no-interaction
php artisan p:environment:mail --driver=smtp --email="outgoing@example.com" --from="Pterodactyl Panel" --host="host.pterodactyl.test" --port=1025 --no-interaction
php artisan migrate --seed
SHELL
@ -69,7 +69,7 @@ Vagrant.configure("2") do |config|
owner: "vagrant", group: "vagrant"
wings.vm.network :forwarded_port, guest: 8080, host: 58080
wings.hostmanager.aliases = %w(wings.local)
wings.hostmanager.aliases = %w(wings.test)
wings.vm.provision "provision", type: "shell", path: "#{vagrant_root}/scripts/provision_wings.sh"
end
@ -78,7 +78,7 @@ Vagrant.configure("2") do |config|
docs.vm.hostname = "documentation"
docs.vm.synced_folder ".", "/vagrant", disabled: true
docs.hostmanager.aliases = %w(pterodocs.local)
docs.hostmanager.aliases = %w(pterodocs.test)
docs.vm.network "forwarded_port", guest: 80, host: 9090
docs.vm.network "forwarded_port", guest: 9091, host: 9091
@ -88,7 +88,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.create_args = ["-it", "--add-host=host.pterodactyl.test:172.17.0.1"]
d.ports = ["9090:80", "9091:9091"]
d.volumes = ["#{vagrant_root}/code/documentation:/srv/documentation:cached"]
d.remains_running = true
@ -108,7 +108,7 @@ Vagrant.configure("2") do |config|
mysql.vm.synced_folder ".data/mysql", "/var/lib/mysql", create: true
mysql.vm.network "forwarded_port", guest: 3306, host: 3306
mysql.hostmanager.aliases = %w(mysql.pterodactyl.local)
mysql.hostmanager.aliases = %w(mysql.pterodactyl.test)
mysql.vm.provider "docker" do |d|
d.image = "mysql:5.7"
@ -137,12 +137,12 @@ Vagrant.configure("2") do |config|
chrome.vm.network "forwarded_port", guest: 4444, host: 4444
chrome.vm.network "forwarded_port", guest: 5900, host: 5900
chrome.hostmanager.aliases = %w(chrome.pterodactyl.local)
chrome.hostmanager.aliases = %w(chrome.pterodactyl.test)
chrome.vm.provider "docker" do |d|
d.image = "selenium/standalone-chrome-debug:3.12.0-boron"
d.ports = ["5900:5900", "4444:4444"]
d.create_args = ["--add-host=pterodactyl.local:172.17.0.1"]
d.create_args = ["--add-host=pterodactyl.test:172.17.0.1"]
d.remains_running = true
end
end
@ -155,7 +155,7 @@ Vagrant.configure("2") do |config|
mh.vm.network "forwarded_port", guest: 1025, host: 1025
mh.vm.network "forwarded_port", guest: 8025, host: 8025
mh.hostmanager.aliases = %w(mailhog.pterodactyl.local)
mh.hostmanager.aliases = %w(mailhog.pterodactyl.test)
mh.vm.provider "docker" do |d|
d.image = "mailhog/mailhog"
@ -170,7 +170,7 @@ Vagrant.configure("2") do |config|
redis.vm.synced_folder ".", "/vagrant", disabled: true
redis.vm.network "forwarded_port", guest: 6379, host: 6379
redis.hostmanager.aliases = %w(redis.pterodactyl.local)
redis.hostmanager.aliases = %w(redis.pterodactyl.test)
redis.vm.provision :hostmanager

4
build/configs/nginx/pterodactyl.local.conf → build/configs/nginx/pterodactyl.test.conf
View File

@ -1,6 +1,6 @@
server {
listen 80;
server_name pterodactyl.local;
server_name pterodactyl.test;
root /srv/www/public;
index index.html index.htm index.php;
@ -14,7 +14,7 @@ server {
location = /robots.txt { access_log off; log_not_found off; }
access_log off;
error_log /var/log/nginx/pterodactyl.app-error.log error;
error_log /var/log/nginx/pterodactyl.test-error.log error;
client_max_body_size 100m;
client_body_timeout 120s;

2
build/configs/nginx/pterodocs.local.conf → build/configs/nginx/pterodocs.test.conf
View File

@ -2,7 +2,7 @@ server {
listen 80;
index index.html;
server_name pterodocs.local;
server_name pterodocs.test;
root /srv/documentation/.vuepress/dist;
location / {

6
scripts/deploy_app.sh
View File

@ -2,7 +2,7 @@
export DEBIAN_FRONTEND=noninteractive
cp /tmp/.deploy/supervisor/pterodactyl.conf /etc/supervisor/conf.d/pterodactyl.conf
cp /tmp/.deploy/nginx/pterodactyl.local.conf /etc/nginx/sites-available/pterodactyl.local.conf
cp /tmp/.deploy/nginx/pterodactyl.test.conf /etc/nginx/sites-available/pterodactyl.test.conf
# Needed for FPM to start correctly.
mkdir -p /run/php
@ -49,7 +49,7 @@ EOF
cat >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini <<EOF
xdebug.remote_enable=1
xdebug.profiler_enable=1
xdebug.remote_host=host.pterodactyl.local
xdebug.remote_host=host.pterodactyl.test
EOF
# Install development dependencies
@ -58,7 +58,7 @@ yarn install --no-progress
# Cleanup
rm -rfv /var/www
rm -rv /etc/nginx/sites-enabled/*
ln -s /etc/nginx/sites-available/pterodactyl.local.conf /etc/nginx/sites-enabled/pterodactyl.local.conf
ln -s /etc/nginx/sites-available/pterodactyl.test.conf /etc/nginx/sites-enabled/pterodactyl.test.conf
# Start processes
supervisorctl reread

4
scripts/deploy_docs.sh
View File

@ -10,7 +10,7 @@ apt install -y --no-install-recommends nginx nodejs yarn supervisor
# Copy over deployment specific files.
cp /tmp/.deploy/supervisor/pterodocs.conf /etc/supervisor/conf.d/pterodocs.conf
cp /tmp/.deploy/nginx/pterodocs.local.conf /etc/nginx/sites-available/pterodocs.local.conf
cp /tmp/.deploy/nginx/pterodocs.test.conf /etc/nginx/sites-available/pterodocs.test.conf
cd /srv/documentation
yarn add vuepress
@ -21,7 +21,7 @@ ln -s /srv/documentation ~/docs
# Configure and restart nginx
rm -rfv /var/www
rm -rfv /etc/nginx/sites-enabled/*
ln -s /etc/nginx/sites-available/pterodocs.local.conf /etc/nginx/sites-enabled/pterodocs.local.conf
ln -s /etc/nginx/sites-available/pterodocs.test.conf /etc/nginx/sites-enabled/pterodocs.test.conf
supervisorctl reread
supervisorctl update