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

1 files changed, 0 insertions, 36 deletions

diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
deleted file mode 100755
index ce1d643..0000000
--- a/share/hydractl/bootstrap
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Bootstrap a new hydra using the current host as a starting point.
-#
-# 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/>.
-
-STAGE="$1"
-
-if [ "$STAGE" == "repository" ]; then
-  hydractl puppet-install
-
-  if [ ! -d "/etc/puppet/.git" ]; then
-    rm -rf /etc/puppet && git clone git://git.fluxo.info/puppet-bootstrap /etc/puppet
-    hydra_bootstrap_config /etc/puppet
-    chown -R puppet. /etc/puppet
-  fi
-fi
-
-if [ -e "/etc/puppet/manifests/$stage.pp" ]; then
-  (
-    cd /etc/puppet
-    make apply stage=$stage
-  )
-fi