aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-19 11:47:44 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-19 11:47:44 -0200
commit25d3c4cd2632d6ee0f57f264cf79304404cb0e3d (patch)
treebb90e20fe5c229f2501e7bd8194973f40f08d0f1
parent517f70e24ea76925bef7d52e219dbce8f014d8e4 (diff)
downloadhydra-25d3c4cd2632d6ee0f57f264cf79304404cb0e3d.tar.gz
hydra-25d3c4cd2632d6ee0f57f264cf79304404cb0e3d.tar.bz2
Intialization fixes
-rwxr-xr-xshare/hydra/init18
-rwxr-xr-xshare/hydra/install2
-rwxr-xr-xshare/hydractl/bootstrap2
-rwxr-xr-xshare/hydractl/install2
4 files changed, 14 insertions, 10 deletions
diff --git a/share/hydra/init b/share/hydra/init
index d21c003..c68b562 100755
--- a/share/hydra/init
+++ b/share/hydra/init
@@ -67,16 +67,20 @@ else
fi
# Create bootless repository
- echo "Initializing bootless repository..."
- hydra $HYDRA bootless init
+ if [ ! -d "$BASEDIR/bootless" ]; then
+ echo "Initializing bootless repository..."
+ hydra $HYDRA bootless init
+ fi
# Create puppet repository
- echo "Cloning initial puppet repository..."
- git clone git://git.sarava.org/puppet-bootstrap.git $BASEDIR/puppet
+ if [ ! -d "$BASEDIR/puppet" ]; then
+ echo "Cloning initial puppet repository..."
+ git clone git://git.fluxo.info/puppet-bootstrap.git $BASEDIR/puppet
- # Config puppet
- echo "Configuring puppet repository..."
- hydra_bootstrap_config $BASEDIR/puppet
+ # Config puppet
+ echo "Configuring puppet repository..."
+ hydra_bootstrap_config $BASEDIR/puppet
+ fi
fi
cat<<-EOF
diff --git a/share/hydra/install b/share/hydra/install
index 93ede8e..91a1226 100755
--- a/share/hydra/install
+++ b/share/hydra/install
@@ -30,7 +30,7 @@ fi
# Validation
if [ -z "$ORIGIN" ]; then
- ORIGIN="git://git.sarava.org/hydra.git"
+ ORIGIN="git://git.fluxo.info/hydra.git"
else
ORIGIN_CONFIG="`hydra $HYDRA config git`"
diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
index 0d60b50..ce1d643 100755
--- a/share/hydractl/bootstrap
+++ b/share/hydractl/bootstrap
@@ -22,7 +22,7 @@ if [ "$STAGE" == "repository" ]; then
hydractl puppet-install
if [ ! -d "/etc/puppet/.git" ]; then
- rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet
+ 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
diff --git a/share/hydractl/install b/share/hydractl/install
index 7eb6830..0f43b4f 100755
--- a/share/hydractl/install
+++ b/share/hydractl/install
@@ -22,7 +22,7 @@ hydra_config_load
# Validation
if [ -z "$ORIGIN" ]; then
- ORIGIN="git://git.sarava.org/hydra.git"
+ ORIGIN="git://git.fluxo.info/hydra.git"
fi
# Set sudo config