Merge pull request #37 from Varying-Vagrant-Vagrants/Mte90/fix-tls-ca

Remove define of a global var
Varying-Vagrant-Vagrants · Oct 31, 2019 · 301fc50 · 301fc50
2 parents 8e24ff0 + 1ececb8
commit 301fc50
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/tls-ca/provision.sh b/tls-ca/provision.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-VVV_CONFIG=/vagrant/vvv-config.yml
-if [[ -f /vagrant/vvv-custom.yml ]]; then
-	VVV_CONFIG=/vagrant/vvv-custom.yml
+VVV_CONFIG=/vagrant/vvv-custom.yml
+if [[ -f /vagrant/config.yml ]]; then
+	VVV_CONFIG=/vagrant/config.yml
 fi
+
 codename=$(lsb_release --codename | cut -f2)
 CERTIFICATES_DIR="/srv/certificates"
 if [[ $codename == "trusty" ]]; then # VVV 2 uses Ubuntu 14 LTS trusty