diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0db0e092a..626d6216e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: name: firezone path: ./ - run: | - vagrant cloud auth login --token ${VAGRANT_TOKEN} + vagrant cloud auth login --token ${{ secrets.VAGRANT_TOKEN }} - uses: actions/cache@v2 with: path: | diff --git a/Vagrantfile b/Vagrantfile index 35209503f..00bfd6058 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,6 +7,7 @@ Vagrant.configure('2') do |config| config.vm.define "amazonlinux_2" do |amazonlinux2| amazonlinux2.vm.box = "bento/amazonlinux-2" + amazonlinux2.vm.network "forwarded_port", guest: 8800, host: 8800 source_file = Dir["firezone*amazonlinux_2*.rpm"].first amazonlinux2.vm.provision "file", source: source_file, destination: "/tmp/" amazonlinux2.vm.provision "shell", path: "scripts/provision/amazonlinux_2.sh" @@ -14,6 +15,7 @@ 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 source_file = Dir["firezone*centos_7*.rpm"].first centos7.vm.provision "file", source: source_file, destination: "/tmp/" centos7.vm.provision "shell", path: "scripts/provision/centos_7.sh" @@ -21,6 +23,7 @@ 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: 8800 source_file = Dir["firezone*centos_8*.rpm"].first centos8.vm.provision "file", source: source_file, destination: "/tmp/" centos8.vm.provision "shell", path: "scripts/provision/centos_8.sh" @@ -28,6 +31,7 @@ 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: 8800 source_file = Dir["firezone*debian_10*.deb"].first debian10.vm.provision "file", source: source_file, destination: "/tmp/" debian10.vm.provision "shell", path: "scripts/provision/debian_10.sh" @@ -35,6 +39,7 @@ 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: 8800 source_file = Dir["firezone*fedora_33*.rpm"].first fedora33.vm.provision "file", source: source_file, destination: "/tmp/" fedora33.vm.provision "shell", path: "scripts/provision/fedora_33.sh" @@ -42,6 +47,7 @@ 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: 8800 source_file = Dir["firezone*fedora_34*.rpm"].first fedora34.vm.provision "file", source: source_file, destination: "/tmp/" fedora34.vm.provision "shell", path: "scripts/provision/fedora_34.sh" @@ -49,6 +55,7 @@ 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: 8800 source_file = Dir["firezone*ubuntu_18.04*.deb"].first ubuntu1804.vm.provision "file", source: source_file, destination: "/tmp/" ubuntu1804.vm.provision "shell", path: "scripts/provision/ubuntu_18.04.sh" @@ -56,6 +63,7 @@ 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: 8800 source_file = Dir["firezone*ubuntu_20.04*.deb"].first ubuntu2004.vm.provision "file", source: source_file, destination: "/tmp/" ubuntu2004.vm.provision "shell", path: "scripts/provision/ubuntu_20.04.sh" diff --git a/scripts/provision/amazonlinux_2.sh b/scripts/provision/amazonlinux_2.sh index 8dc854fe4..cd1698f19 100755 --- a/scripts/provision/amazonlinux_2.sh +++ b/scripts/provision/amazonlinux_2.sh @@ -16,4 +16,5 @@ yum install -y epel-release elrepo-release yum install -y yum-plugin-elrepo yum install -y kmod-wireguard wireguard-tools -which wg +rpm -ivh /tmp/firezone*.rpm +service firezone start diff --git a/scripts/provision/centos_7.sh b/scripts/provision/centos_7.sh index 8dc854fe4..cd1698f19 100755 --- a/scripts/provision/centos_7.sh +++ b/scripts/provision/centos_7.sh @@ -16,4 +16,5 @@ yum install -y epel-release elrepo-release yum install -y yum-plugin-elrepo yum install -y kmod-wireguard wireguard-tools -which wg +rpm -ivh /tmp/firezone*.rpm +service firezone start diff --git a/scripts/provision/centos_8.sh b/scripts/provision/centos_8.sh index 58be0d142..774b0db43 100755 --- a/scripts/provision/centos_8.sh +++ b/scripts/provision/centos_8.sh @@ -15,4 +15,5 @@ systemctl restart postgresql yum install -y epel-release elrepo-release yum install -y kmod-wireguard wireguard-tools -which wg +rpm -ivh /tmp/firezone*.rpm +service firezone start diff --git a/scripts/provision/debian_10.sh b/scripts/provision/debian_10.sh index 0c7a9953e..502e27984 100755 --- a/scripts/provision/debian_10.sh +++ b/scripts/provision/debian_10.sh @@ -17,4 +17,5 @@ apt-get -q update # Install WireGuard apt-get install wireguard-tools -which wg +dpkg -i /tmp/firezone*.deb +service firezone start diff --git a/scripts/provision/fedora_33.sh b/scripts/provision/fedora_33.sh index 5b391ab86..b8edc1b4a 100755 --- a/scripts/provision/fedora_33.sh +++ b/scripts/provision/fedora_33.sh @@ -12,4 +12,5 @@ yum install -y \ postgresql-setup initdb systemctl restart postgresql -which wg +rpm -ivh /tmp/firezone*.rpm +service firezone start diff --git a/scripts/provision/fedora_34.sh b/scripts/provision/fedora_34.sh index 5b391ab86..b8edc1b4a 100755 --- a/scripts/provision/fedora_34.sh +++ b/scripts/provision/fedora_34.sh @@ -12,4 +12,5 @@ yum install -y \ postgresql-setup initdb systemctl restart postgresql -which wg +rpm -ivh /tmp/firezone*.rpm +service firezone start diff --git a/scripts/provision/ubuntu_18.04.sh b/scripts/provision/ubuntu_18.04.sh index 5d8400592..059ff5eff 100755 --- a/scripts/provision/ubuntu_18.04.sh +++ b/scripts/provision/ubuntu_18.04.sh @@ -10,4 +10,5 @@ apt-get install -y -q \ wireguard-tools service postgresql start -which wg +dpkg -i /tmp/firezone*.deb +service firezone start diff --git a/scripts/provision/ubuntu_20.04.sh b/scripts/provision/ubuntu_20.04.sh index 5d8400592..059ff5eff 100755 --- a/scripts/provision/ubuntu_20.04.sh +++ b/scripts/provision/ubuntu_20.04.sh @@ -10,4 +10,5 @@ apt-get install -y -q \ wireguard-tools service postgresql start -which wg +dpkg -i /tmp/firezone*.deb +service firezone start