diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-21 11:28:12 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-21 11:28:12 -0300 |
| commit | 6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d (patch) | |
| tree | 4e9745c0c73d74cb85fe91e1113f20652bb9c4f8 /share/hydractl/puppet-update | |
| parent | e40b3514e041a4bb2aac962b639c947333365b4b (diff) | |
| parent | 8addf3ea71f50050a791e618bd4511860264c0de (diff) | |
| download | hydra-6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d.tar.gz hydra-6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d.tar.bz2 | |
Merge branch 'master' into develop
Conflicts:
TODO.md
share/hydra/install
share/hydra/mass
share/hydractl/bootstrap
share/hydractl/puppet-enable
share/hydractl/system-upgrade
Diffstat (limited to 'share/hydractl/puppet-update')
| -rwxr-xr-x | share/hydractl/puppet-update | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/share/hydractl/puppet-update b/share/hydractl/puppet-update deleted file mode 100755 index 0e9e8fe..0000000 --- a/share/hydractl/puppet-update +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# Update puppet repository. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. - -if [ -x '/usr/local/sbin/update-puppet-conf.sh' ]; then - /usr/local/sbin/update-puppet-conf.sh - - # Avoid reparsing of puppet config by just fixing perms if needed. - chown --from=root:root -R puppet.puppet /etc/puppet/* - chown --from=root:root -R puppet.puppet /etc/puppet/.git -else - echo "Could not find /usr/local/sbin/update-puppet-conf.sh" - exit 1 -fi |