diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-12 10:49:56 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-12 10:49:56 -0300 |
| commit | 997f48dddfeb276fbff555983587e769ca45c08d (patch) | |
| tree | 5f013f98f9b52587087e007b3fa9cc9e6ad7b437 | |
| parent | 260408a2cdb337d0c5694e4c94ef2f9a810808b4 (diff) | |
| download | hydra-997f48dddfeb276fbff555983587e769ca45c08d.tar.gz hydra-997f48dddfeb276fbff555983587e769ca45c08d.tar.bz2 | |
Newer systems are masterless
| -rw-r--r-- | lib/hydra/misc | 1 | ||||
| -rwxr-xr-x | share/hydractl/puppet-enable | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/hydra/misc b/lib/hydra/misc index f56fdda..d8dfb3b 100644 --- a/lib/hydra/misc +++ b/lib/hydra/misc @@ -2,6 +2,7 @@ # Set needed environment variables and do basic checks function hydra_set_env { + export OSVERSION="`cut -d . -f 1 /etc/debian_version`" export COMMIT="`( cd $APP_BASE && git log -n 1 --pretty=oneline 2> /dev/null | cut -d " " -f 1 )`" export CONFIG="$HOME/.hydra/config" export ACTION="$1" diff --git a/share/hydractl/puppet-enable b/share/hydractl/puppet-enable index 8579081..b29603c 100755 --- a/share/hydractl/puppet-enable +++ b/share/hydractl/puppet-enable @@ -23,6 +23,11 @@ hydra_config_load # Command line arguments BASENAME="`basename $0`" +# Newer systems are masterless +if [ "$OSVERSION" != "7" ]; then + exit +fi + # Set sudo config if [ "`whoami`" != 'root' ]; then sudo="sudo" |