diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-07-06 13:59:56 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-07-06 13:59:56 -0300 |
| commit | d33c587ea493e5f0665554d9cb4845961725c261 (patch) | |
| tree | daf5de6c57fb4eefb566cd5ef126e57839c8e274 /bin | |
| parent | 47c83e6fc82afd55110c9184234e31dc751e5347 (diff) | |
| download | puppet-bootstrap-d33c587ea493e5f0665554d9cb4845961725c261.tar.gz puppet-bootstrap-d33c587ea493e5f0665554d9cb4845961725c261.tar.bz2 | |
Shell provisioner sudo fix
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/provision | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/bin/provision b/bin/provision index a3e80d7..6e06320 100755 --- a/bin/provision +++ b/bin/provision @@ -3,8 +3,13 @@ # Simple shell provisioner for Vagrant instances. # +# Set sudo config +if [ "`whoami`" != 'root' ]; then + sudo="sudo" +fi + # Ensure the system is updated. -sudo apt-get update && DEBIAN_FRONTEND=noninteractive sudo apt-get dist-upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean +$sudo apt-get update && DEBIAN_FRONTEND=noninteractive $sudo apt-get dist-upgrade -y && $sudo apt-get autoremove -y && $sudo apt-get clean # Install dependencies source /vagrant/puppet/bin/dependencies @@ -16,12 +21,12 @@ done # Link hiera configuration. if [ ! -h "/etc/puppet/hiera.yaml" ]; then - sudo rm -f /etc/puppet/hiera.yaml - sudo ln -s /vagrant/puppet/hiera/hiera.yaml /etc/puppet/hiera.yaml + $sudo rm -f /etc/puppet/hiera.yaml + $sudo ln -s /vagrant/puppet/hiera/hiera.yaml /etc/puppet/hiera.yaml fi # Link puppet configuration. if [ ! -h "/etc/puppet/puppet.conf" ]; then - sudo rm -f /etc/puppet/puppet.conf - sudo ln -s /vagrant/puppet/puppet.conf /etc/puppet/puppet.conf + $sudo rm -f /etc/puppet/puppet.conf + $sudo ln -s /vagrant/puppet/puppet.conf /etc/puppet/puppet.conf fi |