diff options
| author | Michael Scherer <misc@mageia.org> | 2012-02-10 14:20:01 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-02-10 14:20:01 +0000 |
| commit | 13044c786d558912bbebe0718a2c22de2bc13d13 (patch) | |
| tree | eb325aedf30e5bbb94c69ce4eb5dcfa4f11c299d /deployment/repositories | |
| parent | 1451c5f4861941f56712cb813f0ce0ac5151c741 (diff) | |
| download | puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar.gz puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar.bz2 puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar.xz puppet-13044c786d558912bbebe0718a2c22de2bc13d13.zip | |
make sure puppet config is erased by the reference one
in case of conflicts when committing
Diffstat (limited to 'deployment/repositories')
| -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 + |