]> gitweb.fluxo.info Git - hydra.git/commitdiff
Intialization fixes
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 19 Oct 2015 13:47:44 +0000 (11:47 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 19 Oct 2015 13:47:44 +0000 (11:47 -0200)
share/hydra/init
share/hydra/install
share/hydractl/bootstrap
share/hydractl/install

index d21c003ab868c18b900c4a6000f73540cd09d882..c68b56215878c23e6f3753d083fd285be9e70ee5 100755 (executable)
@@ -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
index 93ede8ec10960a32f278caf2d12117fd3f2244a4..91a1226bb50ed5542146d1bdd1572c49a527e5ad 100755 (executable)
@@ -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`"
 
index 0d60b50b55c68b28d5978a4eb4991b59e4ea085e..ce1d64367c33c58e8c6e16f49e69d4f259ceff35 100755 (executable)
@@ -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
index 7eb6830a635349940a85f25e37013917303f002c..0f43b4f5ef89b05a510cd4d392501db14fe2655d 100755 (executable)
@@ -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