summaryrefslogtreecommitdiff
path: root/global/post-tasks.d
diff options
context:
space:
mode:
Diffstat (limited to 'global/post-tasks.d')
-rwxr-xr-xglobal/post-tasks.d/018packages3
-rwxr-xr-xglobal/post-tasks.d/030puppet2
2 files changed, 4 insertions, 1 deletions
diff --git a/global/post-tasks.d/018packages b/global/post-tasks.d/018packages
index 5ca5c63..3e2e26e 100755
--- a/global/post-tasks.d/018packages
+++ b/global/post-tasks.d/018packages
@@ -31,6 +31,9 @@ if [ -f $CONFIG ]; then
elif [ -d $CACHE_DIR/scm/$module/.git ]; then
if [ "$update" = "yes" ]; then
cd $CACHE_DIR/scm/$module
+ if [ "$src" != "$(git config remote.origin.url)" ]; then
+ git config remote.origin.url $src
+ fi
git pull -q
else
continue
diff --git a/global/post-tasks.d/030puppet b/global/post-tasks.d/030puppet
index 6b1d33a..6742949 100755
--- a/global/post-tasks.d/030puppet
+++ b/global/post-tasks.d/030puppet
@@ -8,6 +8,6 @@ fi
if [ -f /usr/bin/puppet -a -d /etc/puppet/manifests ]; then
for m in `find /etc/puppet/manifests -name \*.pp`; do
- puppet apply $args $m
+ puppet apply $args < $m
done
fi