From 2c61cfc7f752e8968f4de31c3fb57d61d128b94d Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 24 Oct 2017 09:23:02 -0200
Subject: Fix puppet provisioning

---
 .gitignore           | 1 +
 bin/debian-dev-setup | 6 ++++--
 kvmxfile             | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d99c302..962f7eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tmp
 /recentchanges
 /www
 build-area
+puppet/modules
diff --git a/bin/debian-dev-setup b/bin/debian-dev-setup
index 5e56385..7162b07 100755
--- a/bin/debian-dev-setup
+++ b/bin/debian-dev-setup
@@ -6,10 +6,12 @@
 # Default provisioner
 if [ -x "/vagrant/puppet/bin/provision" ]; then
   /vagrant/puppet/bin/provision
-  /vagrant/puppet/bin/deploy
 elif [ -x "/home/user/code/debian/puppet/bin/provision" ]; then
   /home/user/code/debian/puppet/bin/provision
-  /home/user/code/debian/puppet/bin/deploy
+fi
+
+if [ -x "/etc/puppet/bin/deploy" ]; then
+  /etc/puppet/bin/deploy
 fi
 
 # Parameter
diff --git a/kvmxfile b/kvmxfile
index 4b015b0..b4e2d51 100644
--- a/kvmxfile
+++ b/kvmxfile
@@ -20,7 +20,7 @@ password="$RANDOM"
 shared_folders="debian:.:/home/$user/code/debian,distros:/var/data/distros:/var/data/distros"
 
 # Folder to sync during provisioning in the format "/host/folder /guest/folder".
-provision_rsync="$KVMX_BASE/share/provision/ /usr/local/share/kvmx/provision/"
+provision_rsync="puppet /etc/puppet/"
 
 # Absolute path for a provision script located inside the guest.
 provision_command="/usr/local/share/kvmx/provision/development && /home/user/code/$VM/bin/debian-dev-setup"
-- 
cgit v1.2.3