From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Mar 2016 14:28:12 +0000 (-0300)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.2.4~200
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d;p=hydra.git

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
---

6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d
diff --cc TODO.md
index 94ca81a,46c49ac..f6b48ee
--- a/TODO.md
+++ b/TODO.md
@@@ -4,11 -4,34 +4,13 @@@ TOD
  Hydra
  -----
  
 -- ansible integration.
 -- module-commit:
 -  - check and set git-flow and production branch in all repositories.
 -  - check, install and test puppet pre-commit via git-hooks on all repositories using module-commit.
 +- implement a general test suite.
 +- install: move to /usr/local/share/hydra.
  - bootless: properly support `$subdevice` in parted or always use first partition (like `/dev/sdb1`).
 +- init: add new repositories as superproject's submodules.
 +- newnode: do not generate manifest file, only hiera.
+ - ssh-config: hydra integration.
+ - init: version control in the superproject?
  - deploy:
 -  - install keys?
 -  - use /etc/hydra/{puppet,keyring,etc}?
 -
 -Hydractl
 ---------
 -
 -- provision:
 -  - command line parameters using key=value pairs.
 -  - config parser using a custom function with `include` directive, avoiding `source`.
 -- install: PREFIX support.
 -- deploy: install keys
 -- upgrade: run docker upgrade on all available images.
 -- wrapper to import/export monkeysphere keys into keyringer.
 -- backup-{site,copy,restore}: call backup-restore-user.
 -- backup-restore-site {debian,wiki}.
 -- backup-restore-user and backup-restore-users.
 -- backup-restore-SERVICE: stop/start service.
 -- backup-copy action.
 -- backup-restore-reprepro: rsync -av /var/backups/remote/$ORIG/restore/$DATE/var/reprepro/ /var/reprepro/.
 -- backup-restore-sites: support for other backup locations.
 -- backup-restore-site:
 -  - metastore integration for fine-grained permissions.
 -  - use metadata do detect drupal series.
 +  - fix /etc/puppet permissions.
 +  - import keys and certs.
diff --cc share/hydra/install
index 6a3c07f,8b93ae7..00154b7
--- a/share/hydra/install
+++ b/share/hydra/install
@@@ -28,15 -28,9 +28,14 @@@ if [ -z "$NODES" ]; the
    NODES="`hydra $HYDRA nodes`"
  fi
  
--# Validation
--if [ -z "$ORIGIN" ]; then
-   ORIGIN="git://git.fluxo.info/hydra.git"
- else
-   ORIGIN_CONFIG="`hydra $HYDRA config git`"
++# Get origin
++ORIGIN_CONFIG="`hydra $HYDRA config git`"
 +
-   if [ ! -z "$ORIGIN_CONFIG" ]; then
-     ORIGIN="$ORIGIN_CONFIG/hydra.git"
-   fi
++# Validate origin
++if [ ! -z "$ORIGIN_CONFIG" ]; then
++  ORIGIN="$ORIGIN_CONFIG/hydra.git"
++else
+   ORIGIN="git://git.fluxo.info/hydra.git"
  fi
  
  # Deploy