From d5aaec1165c5cf529a70907c31f24164ee12188a Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sun, 8 Jul 2012 13:32:54 -0300 Subject: Moving hydra register to hydra init (2) --- share/hydra/init | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ share/hydra/register | 54 ---------------------------------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) create mode 100755 share/hydra/init delete mode 100755 share/hydra/register diff --git a/share/hydra/init b/share/hydra/init new file mode 100755 index 0000000..d9eeccb --- /dev/null +++ b/share/hydra/init @@ -0,0 +1,54 @@ +#!/bin/bash +# +# Register an existing hydra +# +# 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 +# . + +# Load +source $APP_BASE/lib/hydra/functions || exit 1 +hydra_config_load + +# Command line arguments +BASEDIR="$1" + +# Validation +if [ -z "$BASEDIR" ]; then + echo "Usage: hydra [hydra] register " + exit 1 +elif grep -q -e "^$HYDRA=" $CONFIG &> /dev/null; then + echo "Hydra $HYDRA already defined" + exit 1 +fi + +# Reparse basedir to force absolute folder +BASEDIR="`cd $BASEDIR && pwd`" + +# Add entry +echo "Registering hydra $HYDRA..." +mkdir -p $BASEDIR +chmod 700 $BASEDIR +echo "$HYDRA=\"$BASEDIR\"" >> $CONFIG + +# Puppet configuration +echo "Searching for a puppet repository at $BASEDIR..." +PUPPET="$(dirname `find $BASEDIR -name puppet.conf | tail -n 1`)" + +# TODO: setup or clone initial repositories + +if [ ! -z "$PUPPET" ]; then + echo "Found puppet repository at $PUPPET." + echo "PUPPET=$PUPPET" >> $PREFERENCES +fi + diff --git a/share/hydra/register b/share/hydra/register deleted file mode 100755 index d9eeccb..0000000 --- a/share/hydra/register +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Register an existing hydra -# -# 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 -# . - -# Load -source $APP_BASE/lib/hydra/functions || exit 1 -hydra_config_load - -# Command line arguments -BASEDIR="$1" - -# Validation -if [ -z "$BASEDIR" ]; then - echo "Usage: hydra [hydra] register " - exit 1 -elif grep -q -e "^$HYDRA=" $CONFIG &> /dev/null; then - echo "Hydra $HYDRA already defined" - exit 1 -fi - -# Reparse basedir to force absolute folder -BASEDIR="`cd $BASEDIR && pwd`" - -# Add entry -echo "Registering hydra $HYDRA..." -mkdir -p $BASEDIR -chmod 700 $BASEDIR -echo "$HYDRA=\"$BASEDIR\"" >> $CONFIG - -# Puppet configuration -echo "Searching for a puppet repository at $BASEDIR..." -PUPPET="$(dirname `find $BASEDIR -name puppet.conf | tail -n 1`)" - -# TODO: setup or clone initial repositories - -if [ ! -z "$PUPPET" ]; then - echo "Found puppet repository at $PUPPET." - echo "PUPPET=$PUPPET" >> $PREFERENCES -fi - -- cgit v1.2.3