summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-20 14:51:02 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-20 14:51:02 -0300
commit41edaeba8733cd1b777bb5c4ccd5c81ef2a53a2e (patch)
treee8db1a57c2bb424b3008a30334675cff085c9aa5
parent1c3054ae1923d6a748e300768d29cba8f9cdd6c2 (diff)
downloadhydra-41edaeba8733cd1b777bb5c4ccd5c81ef2a53a2e.tar.gz
hydra-41edaeba8733cd1b777bb5c4ccd5c81ef2a53a2e.tar.bz2
Removes puppet-enable and puppet-disable
l---------share/hydractl/puppet-disable1
-rwxr-xr-xshare/hydractl/puppet-enable38
-rwxr-xr-xshare/hydractl/system-upgrade15
3 files changed, 5 insertions, 49 deletions
diff --git a/share/hydractl/puppet-disable b/share/hydractl/puppet-disable
deleted file mode 120000
index d68c04b..0000000
--- a/share/hydractl/puppet-disable
+++ /dev/null
@@ -1 +0,0 @@
-puppet-enable \ No newline at end of file
diff --git a/share/hydractl/puppet-enable b/share/hydractl/puppet-enable
deleted file mode 100755
index 8579081..0000000
--- a/share/hydractl/puppet-enable
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# Disable puppet agent.
-#
-# 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/>.
-
-# Load
-source $APP_BASE/lib/hydra/functions || exit 1
-hydra_config_load
-
-# Command line arguments
-BASENAME="`basename $0`"
-
-# Set sudo config
-if [ "`whoami`" != 'root' ]; then
- sudo="sudo"
-fi
-
-# Business
-if [ "$BASENAME" == "puppet-enable" ]; then
- $sudo sed -i -e 's/START=no/START=yes/' /etc/default/puppet
- $sudo service puppet start
-else
- $sudo sed -i -e 's/START=yes/START=no/' /etc/default/puppet
- $sudo service puppet stop
-fi
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index 2ad06e6..b9a6b96 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -81,8 +81,11 @@ function hydra_system_upgrade_env {
# Prepare the environment for a system upgrade
function hydra_system_upgrade_prepare {
# Ensure puppet is stopped during the process
- echo "Disabling puppet during the upgrade..."
- hydractl puppet-disable
+ if [ -e "/etc/default/puppet" ]; then
+ echo "Disabling puppet agent..."
+ sed -i -e 's/START=yes/START=no/' /etc/default/puppet
+ service puppet stop
+ fi
# Configure apt for the next debian release
echo ""
@@ -151,14 +154,6 @@ function hydra_system_upgrade_custom {
fi
hydractl trac-upgrade
- hydra_system_upgrade_stage puppet
-}
-
-# Enable puppet again
-function hydra_system_upgrade_puppet {
- echo ""
- echo "Starting puppet again..."
- hydractl puppet-enable
}
# Initialize