diff options
| -rw-r--r-- | deployment/repositories/templates/puppet_update.sh | 2 | ||||
| -rw-r--r-- | 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 + |