summaryrefslogtreecommitdiff
path: root/puppet/bin/provision
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-10-23 19:43:47 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-10-23 19:43:47 -0200
commitb45c60df8af294fe97b8912a0b9703c76e5de8d6 (patch)
tree2a3442f2e0b3c7494cc591ac8c8053d84c3c9d84 /puppet/bin/provision
parentc880b15f013c6d761e4632570112f796ffc1dcda (diff)
parent1bfffe2e0adff6e44ec33726988b64f95ea2f599 (diff)
downloaddebian-b45c60df8af294fe97b8912a0b9703c76e5de8d6.tar.gz
debian-b45c60df8af294fe97b8912a0b9703c76e5de8d6.tar.bz2
Merge commit '1bfffe2e0adff6e44ec33726988b64f95ea2f599' into develop
Diffstat (limited to 'puppet/bin/provision')
-rwxr-xr-xpuppet/bin/provision11
1 files changed, 3 insertions, 8 deletions
diff --git a/puppet/bin/provision b/puppet/bin/provision
index 16f102f..99cb862 100755
--- a/puppet/bin/provision
+++ b/puppet/bin/provision
@@ -13,23 +13,18 @@ source $DIRNAME/dependencies
$SUDO apt-get update && DEBIAN_FRONTEND=noninteractive $SUDO apt-get dist-upgrade -y && $SUDO apt-get autoremove -y && $SUDO apt-get clean
# Ensure additional dependencies are installed.
-for package in usbutils; do
- provision_package $package
-done
-
-# Storeconfigs support
-for package in ruby-sqlite3 ruby-activerecord ruby-activerecord-deprecated-finders; do
+for package in $DEPLOY_DEPENDENCIES; do
provision_package $package
done
# Link hiera configuration if needed.
if [ ! -h "/etc/puppet/hiera.yaml" ]; then
$SUDO rm -f /etc/puppet/hiera.yaml
- $SUDO ln -s $DIRNAME/../hiera/hiera.yaml /etc/puppet/hiera.yaml
+ $SUDO ln -s $DIRNAME/../config/hiera.yaml /etc/puppet/hiera.yaml
fi
# Link puppet configuration if needed.
-if [ ! -h "/etc/puppet/puppet.conf" ]; then
+if [ ! -h "/etc/puppet/puppet.conf" ] && [ -e "$DIRNAME/../puppet.conf" ]; then
$SUDO rm -f /etc/puppet/puppet.conf
$SUDO ln -s $DIRNAME/../puppet.conf /etc/puppet/puppet.conf
fi