diff --git a/Vagrantfile b/Vagrantfile index d6a6f2942..0accf2c50 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,8 +16,10 @@ Vagrant.configure("2") do |config| config.vm.define "centos_7" do |centos7| centos7.vm.box = "generic/centos7" centos7.vm.network "forwarded_port", guest: 8800, host: 8800 + centos7.vm.provision "file", source: ".", destination: "/home/vagrant/app" centos7.vm.provision "shell", path: "scripts/provision/centos_7.sh", + privileged: false, env: { PKG_FILE: "firezone-#{VERSION}-centos_7.amd64.tar.gz" } source_file = Dir["_build/firezone*centos_7*.tar.gz"].first if source_file @@ -29,8 +31,10 @@ Vagrant.configure("2") do |config| config.vm.define "centos_8" do |centos8| centos8.vm.box = "generic/centos8" centos8.vm.network "forwarded_port", guest: 8800, host: 8801 + centos8.vm.provision "file", source: ".", destination: "/home/vagrant/app" centos8.vm.provision "shell", path: "scripts/provision/centos_8.sh", + privileged: false, env: { PKG_FILE: "firezone-#{VERSION}-centos_8.amd64.tar.gz" } source_file = Dir["_build/firezone*centos_8*.tar.gz"].first if source_file @@ -42,8 +46,10 @@ Vagrant.configure("2") do |config| config.vm.define "debian_10" do |debian10| debian10.vm.box = "generic/debian10" debian10.vm.network "forwarded_port", guest: 8800, host: 8802 + debian10.vm.provision "file", source: ".", destination: "/home/vagrant/app" debian10.vm.provision "shell", path: "scripts/provision/debian_10.sh", + privileged: false, env: { PKG_FILE: "firezone-#{VERSION}-debian_10.amd64.tar.gz" } source_file = Dir["_build/firezone*debian_10*.tar.gz"].first if source_file @@ -55,8 +61,10 @@ Vagrant.configure("2") do |config| config.vm.define "fedora_33" do |fedora33| fedora33.vm.box = "generic/fedora33" fedora33.vm.network "forwarded_port", guest: 8800, host: 8803 + fedora33.vm.provision "file", source: ".", destination: "/home/vagrant/app" fedora33.vm.provision "shell", path: "scripts/provision/fedora_33.sh", + privileged: false, env: { PKG_FILE: "firezone-#{VERSION}-fedora_33.amd64.tar.gz" } source_file = Dir["_build/firezone*fedora_33*.tar.gz"].first if source_file @@ -68,8 +76,10 @@ Vagrant.configure("2") do |config| config.vm.define "fedora_34" do |fedora34| fedora34.vm.box = "generic/fedora34" fedora34.vm.network "forwarded_port", guest: 8800, host: 8804 + fedora34.vm.provision "file", source: ".", destination: "/home/vagrant/app" fedora34.vm.provision "shell", path: "scripts/provision/fedora_34.sh", + privileged: false, env: { PKG_FILE: "firezone-#{VERSION}-fedora_34.amd64.tar.gz" } source_file = Dir["_build/firezone*fedora_34*.tar.gz"].first if source_file @@ -81,8 +91,10 @@ Vagrant.configure("2") do |config| config.vm.define "ubuntu_18.04" do |ubuntu1804| ubuntu1804.vm.box = "generic/ubuntu1804" ubuntu1804.vm.network "forwarded_port", guest: 8800, host: 8805 + ubuntu1804.vm.provision "file", source: ".", destination: "/home/vagrant/app" ubuntu1804.vm.provision "shell", path: "scripts/provision/ubuntu_18.04.sh", + privileged: false, env: { PKG_FILE: "firezone-#{VERSION}-ubuntu_18.04.amd64.tar.gz" } source_file = Dir["_build/firezone*ubuntu_18.04*.tar.gz"].first if source_file @@ -94,8 +106,10 @@ Vagrant.configure("2") do |config| config.vm.define "ubuntu_20.04" do |ubuntu2004| ubuntu2004.vm.box = "generic/ubuntu2004" ubuntu2004.vm.network "forwarded_port", guest: 8800, host: 8806 + ubuntu2004.vm.provision "file", source: ".", destination: "/home/vagrant/app" ubuntu2004.vm.provision "shell", path: "scripts/provision/ubuntu_20.04.sh", + privileged: false, env: { PKG_FILE: "firezone-#{VERSION}-ubuntu_20.04.amd64.tar.gz" } source_file = Dir["_build/firezone*ubuntu_20.04*.tar.gz"].first if source_file diff --git a/scripts/provision/centos_7.sh b/scripts/provision/centos_7.sh index 5e221e6d4..a1116867d 100755 --- a/scripts/provision/centos_7.sh +++ b/scripts/provision/centos_7.sh @@ -27,20 +27,18 @@ sudo yum install -y \ iptables # Set locale -sudo localedef -i en_US -f UTF-8 en_US.UTF-8 -sudo echo "LANG=en_US.UTF-8" > /etc/locale.conf -export LANG=en_US.UTF-8 -export LANGUAGE=en_US:en -export LC_ALL=en_US.UTF-8 +sudo bash -c 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' +sudo localectl set-locale LANG=en_US.UTF-8 # Set up Postgres sudo postgresql-setup initdb -sudo cat < /var/lib/pgsql/data/pg_hba.conf -local all all peer -host all all 127.0.0.1/32 md5 -host all all ::1/128 md5 -EOT +# sudo bash -c 'cat < /var/lib/pgsql/data/pg_hba.conf +# local all all peer +# host all all 127.0.0.1/32 md5 +# host all all ::1/128 md5 +# EOT +# ' sudo systemctl enable postgresql sudo systemctl restart postgresql @@ -58,10 +56,11 @@ sudo yum install -y kmod-wireguard wireguard-tools git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc echo '. $HOME/.asdf/completions/asdf.bash' >> $HOME/.bashrc -source $HOME/.bashrc +. $HOME/.asdf/asdf.sh asdf plugin-add nodejs asdf plugin-add erlang asdf plugin-add elixir +cd app asdf install diff --git a/scripts/provision/centos_8.sh b/scripts/provision/centos_8.sh index 75d45a30a..b20ec4b17 100755 --- a/scripts/provision/centos_8.sh +++ b/scripts/provision/centos_8.sh @@ -27,21 +27,18 @@ sudo yum install -y \ iptables # Set locale -sudo localedef -i en_US -f UTF-8 en_US.UTF-8 -sudo echo "LANG=en_US.UTF-8" > /etc/locale.conf -export LANG=en_US.UTF-8 -export LANGUAGE=en_US:en -export LC_ALL=en_US.UTF-8 +sudo bash -c 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' +sudo localectl set-locale LANG=en_US.UTF-8 # Set up Postgres sudo postgresql-setup --initdb --unit postgresql # Fix postgres login -sudo cat < /var/lib/pgsql/data/pg_hba.conf -local all all peer -host all all 127.0.0.1/32 md5 -host all all ::1/128 md5 -EOT +# sudo cat < /var/lib/pgsql/data/pg_hba.conf +# local all all peer +# host all all 127.0.0.1/32 md5 +# host all all ::1/128 md5 +# EOT sudo systemctl enable postgresql sudo systemctl restart postgresql @@ -53,10 +50,11 @@ sudo yum install -y kmod-wireguard wireguard-tools git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc echo '. $HOME/.asdf/completions/asdf.bash' >> $HOME/.bashrc -source $HOME/.bashrc +. $HOME/.asdf/asdf.sh asdf plugin-add nodejs asdf plugin-add erlang asdf plugin-add elixir +cd app asdf install diff --git a/scripts/provision/debian_10.sh b/scripts/provision/debian_10.sh index ce496ff56..38c604868 100755 --- a/scripts/provision/debian_10.sh +++ b/scripts/provision/debian_10.sh @@ -43,7 +43,7 @@ sudo systemctl enable postgresql sudo systemctl start postgresql # Add Backports repo -sudo echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list +sudo bash -c 'echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list' sudo apt-get -q update # Install WireGuard @@ -56,10 +56,11 @@ sudo apt-get install -y -q \ git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc echo '. $HOME/.asdf/completions/asdf.bash' >> $HOME/.bashrc -source $HOME/.bashrc +. $HOME/.asdf/asdf.sh asdf plugin-add nodejs asdf plugin-add erlang asdf plugin-add elixir +cd app asdf install diff --git a/scripts/provision/fedora_33.sh b/scripts/provision/fedora_33.sh index a835f9923..1b43bb60e 100755 --- a/scripts/provision/fedora_33.sh +++ b/scripts/provision/fedora_33.sh @@ -28,21 +28,18 @@ sudo yum install -y \ wireguard-tools # Set locale -sudo localedef -i en_US -f UTF-8 en_US.UTF-8 -sudo echo "LANG=en_US.UTF-8" > /etc/locale.conf -export LANG=en_US.UTF-8 -export LANGUAGE=en_US:en -export LC_ALL=en_US.UTF-8 +sudo bash -c 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' +sudo localectl set-locale LANG=en_US.UTF-8 # Set up Postgres sudo postgresql-setup --initdb --unit postgresql # Fix postgres login -sudo cat < /var/lib/pgsql/data/pg_hba.conf -local all all peer -host all all 127.0.0.1/32 md5 -host all all ::1/128 md5 -EOT +# sudo cat < /var/lib/pgsql/data/pg_hba.conf +# local all all peer +# host all all 127.0.0.1/32 md5 +# host all all ::1/128 md5 +# EOT sudo systemctl enable postgresql sudo systemctl restart postgresql @@ -50,10 +47,11 @@ sudo systemctl restart postgresql git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc echo '. $HOME/.asdf/completions/asdf.bash' >> $HOME/.bashrc -source $HOME/.bashrc +. $HOME/.asdf/asdf.sh asdf plugin-add nodejs asdf plugin-add erlang asdf plugin-add elixir +cd app asdf install # Build release diff --git a/scripts/provision/fedora_34.sh b/scripts/provision/fedora_34.sh index 99ddcf31b..4e56ad589 100755 --- a/scripts/provision/fedora_34.sh +++ b/scripts/provision/fedora_34.sh @@ -28,21 +28,18 @@ sudo yum install -y \ wireguard-tools # Set locale -sudo localedef -i en_US -f UTF-8 en_US.UTF-8 -sudo echo "LANG=en_US.UTF-8" > /etc/locale.conf -export LANG=en_US.UTF-8 -export LANGUAGE=en_US:en -export LC_ALL=en_US.UTF-8 +sudo bash -c 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' +sudo localectl set-locale LANG=en_US.UTF-8 # Set up Postgres sudo postgresql-setup --initdb --unit postgresql # Fix postgres login -sudo cat < /var/lib/pgsql/data/pg_hba.conf -local all all peer -host all all 127.0.0.1/32 md5 -host all all ::1/128 md5 -EOT +# sudo cat < /var/lib/pgsql/data/pg_hba.conf +# local all all peer +# host all all 127.0.0.1/32 md5 +# host all all ::1/128 md5 +# EOT sudo systemctl enable postgresql sudo systemctl restart postgresql @@ -50,10 +47,11 @@ sudo systemctl restart postgresql git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc echo '. $HOME/.asdf/completions/asdf.bash' >> $HOME/.bashrc -source $HOME/.bashrc +. $HOME/.asdf/asdf.sh asdf plugin-add nodejs asdf plugin-add erlang asdf plugin-add elixir +cd app asdf install # Build release diff --git a/scripts/provision/ubuntu_18.04.sh b/scripts/provision/ubuntu_18.04.sh index 8571a4cd4..75c3c39a9 100755 --- a/scripts/provision/ubuntu_18.04.sh +++ b/scripts/provision/ubuntu_18.04.sh @@ -49,10 +49,11 @@ sudo systemctl start postgresql git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc echo '. $HOME/.asdf/completions/asdf.bash' >> $HOME/.bashrc -source $HOME/.bashrc +. $HOME/.asdf/asdf.sh asdf plugin-add nodejs asdf plugin-add erlang asdf plugin-add elixir +cd app asdf install diff --git a/scripts/provision/ubuntu_20.04.sh b/scripts/provision/ubuntu_20.04.sh index 8571a4cd4..75c3c39a9 100755 --- a/scripts/provision/ubuntu_20.04.sh +++ b/scripts/provision/ubuntu_20.04.sh @@ -49,10 +49,11 @@ sudo systemctl start postgresql git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc echo '. $HOME/.asdf/completions/asdf.bash' >> $HOME/.bashrc -source $HOME/.bashrc +. $HOME/.asdf/asdf.sh asdf plugin-add nodejs asdf plugin-add erlang asdf plugin-add elixir +cd app asdf install