diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-10-24 09:23:02 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-10-24 09:23:02 -0200 |
| commit | 2c61cfc7f752e8968f4de31c3fb57d61d128b94d (patch) | |
| tree | d50c9d7ff014afbbb59e1cba1e2dbd9b1e86ef70 | |
| parent | 725df82411005d7e144bd2119fae747a58cc27f0 (diff) | |
| download | debian-2c61cfc7f752e8968f4de31c3fb57d61d128b94d.tar.gz debian-2c61cfc7f752e8968f4de31c3fb57d61d128b94d.tar.bz2 | |
Fix puppet provisioning
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | bin/debian-dev-setup | 6 | ||||
| -rw-r--r-- | kvmxfile | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -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 @@ -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" |