From 13044c786d558912bbebe0718a2c22de2bc13d13 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Fri, 10 Feb 2012 14:20:01 +0000 Subject: make sure puppet config is erased by the reference one in case of conflicts when committing --- deployment/repositories/templates/puppet_update.sh | 2 +- deployment/repositories/templates/puppet_update.sudoers | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/repositories/templates/puppet_update.sh b/deployment/repositories/templates/puppet_update.sh index a1adb239..07ff18ab 100644 --- a/deployment/repositories/templates/puppet_update.sh +++ b/deployment/repositories/templates/puppet_update.sh @@ -1,2 +1,2 @@ #!/bin/sh -sudo /usr/bin/svn update -q /etc/puppet +sudo /usr/bin/svn update -q --non-interactive --accept theirs-full /etc/puppet diff --git a/deployment/repositories/templates/puppet_update.sudoers b/deployment/repositories/templates/puppet_update.sudoers index 350b3a96..154bc9c1 100644 --- a/deployment/repositories/templates/puppet_update.sudoers +++ b/deployment/repositories/templates/puppet_update.sudoers @@ -1 +1,2 @@ -%mga-sysadmin ALL= NOPASSWD: /usr/bin/svn update -q /etc/puppet +%mga-sysadmin ALL= NOPASSWD: /usr/bin/svn update -q --non-interactive --accept theirs-full /etc/puppet + -- cgit v1.2.1