BOA: Add Acquia 7.0 platform and fix ftp symlinks issue on upgrades w…

…ith _USE_CURRENT=YES option enabled in Octopus (Albert)

README.txt

@@ -96,14 +96,14 @@ Octopus can install the platforms listed below:
  Managing News 1.2 ------------ http://managingnews.com
  NodeStream ------------------- http://nodestream.org
  Drupal Commons 1.4 ----------- http://acquia.com/drupalcommons
- Acquia 6.20-svn (int) -------- http://bit.ly/acquiadrupal
+ Acquia 6.20 (int) ------------ http://bit.ly/acquiadrupal
+ Acquia 7.0 ------------------- http://bit.ly/acquiadrupal
  OpenPublish 2.3.441 ---------- http://openpublishapp.com
  OpenScholar 2.0-beta10 ------- http://openscholar.harvard.edu
  ProsePoint 0.37 (int) -------- http://prosepoint.org
  Ubercart (int) --------------- http://ubercart.org
  Drupal 5.23 Pressflow -------- http://pressflow.org
  Drupal 6.20 Pressflow (int) -- http://pressflow.org
- Drupal 6.20 Cocomore --------- http://drupal.cocomore.com
  Feature Server --------------- http://bit.ly/fserver
                                 http://bit.ly/fservermore
 

aegir/barracuda/AegirSetupA.sh.txt

@@ -718,57 +718,92 @@ fi
 if [ "$_DIST_INSTALL" = "YES" ] ; then
 msg "$_STATUS A: Create ftp symlinks"
 mrun "sleep 3"
-if [ ! -d "/home/$_USERFTP/platforms/$_THIS_CORE" ] ; then
-  mkdir -p /home/$_USERFTP/platforms/$_THIS_CORE
+  if [ ! -d "/home/$_USERFTP/platforms/$_THIS_CORE" ] ; then
+    mkdir -p /home/$_USERFTP/platforms/$_THIS_CORE
+  fi
   chown -R $_USER:$_USRG /home/$_USERFTP/platforms &> /dev/null
   chmod 700 /home/$_USERFTP &> /dev/null
   if [ -d "$_ROOT/distro/$_THIS_CORE/acquia/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/acquia/sites /home/$_USERFTP/platforms/$_THIS_CORE/acquia
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/acquia" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/acquia/sites /home/$_USERFTP/platforms/$_THIS_CORE/acquia
+    fi
+  fi
+  if [ -d "$_ROOT/distro/$_THIS_CORE/acquia_seven/sites" ] ; then
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/acquia_seven" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/acquia_seven/sites /home/$_USERFTP/platforms/$_THIS_CORE/acquia_seven
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/pressflow-$_DRUPAL5/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/pressflow-$_DRUPAL5/sites /home/$_USERFTP/platforms/$_THIS_CORE/drupal5
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/drupal5" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/pressflow-$_DRUPAL5/sites /home/$_USERFTP/platforms/$_THIS_CORE/drupal5
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/managingnews-$_MANAGINGNEWS/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/managingnews-$_MANAGINGNEWS/sites /home/$_USERFTP/platforms/$_THIS_CORE/managingnews
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/managingnews" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/managingnews-$_MANAGINGNEWS/sites /home/$_USERFTP/platforms/$_THIS_CORE/managingnews
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/atrium-$_OPENATRIUM/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/atrium-$_OPENATRIUM/sites /home/$_USERFTP/platforms/$_THIS_CORE/openatrium
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/openatrium" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/atrium-$_OPENATRIUM/sites /home/$_USERFTP/platforms/$_THIS_CORE/openatrium
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/prosepoint-$_PROSEPOINT/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/prosepoint-$_PROSEPOINT/sites /home/$_USERFTP/platforms/$_THIS_CORE/prosepoint
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/prosepoint" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/prosepoint-$_PROSEPOINT/sites /home/$_USERFTP/platforms/$_THIS_CORE/prosepoint
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/pressflow/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/pressflow/sites /home/$_USERFTP/platforms/$_THIS_CORE/drupal6
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/drupal6" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/pressflow/sites /home/$_USERFTP/platforms/$_THIS_CORE/drupal6
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/uberdrupal/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/uberdrupal/sites /home/$_USERFTP/platforms/$_THIS_CORE/ubercart
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/ubercart" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/uberdrupal/sites /home/$_USERFTP/platforms/$_THIS_CORE/ubercart
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/$_DRUPAL7/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/$_DRUPAL7/sites /home/$_USERFTP/platforms/$_THIS_CORE/drupal7
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/drupal7" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/$_DRUPAL7/sites /home/$_USERFTP/platforms/$_THIS_CORE/drupal7
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/openpublish-$_OPENPUBLISH/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/openpublish-$_OPENPUBLISH/sites /home/$_USERFTP/platforms/$_THIS_CORE/openpublish
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/openpublish" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/openpublish-$_OPENPUBLISH/sites /home/$_USERFTP/platforms/$_THIS_CORE/openpublish
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/openscholar-$_OPENSCHOLAR/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/openscholar-$_OPENSCHOLAR/sites /home/$_USERFTP/platforms/$_THIS_CORE/openscholar
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/openscholar" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/openscholar-$_OPENSCHOLAR/sites /home/$_USERFTP/platforms/$_THIS_CORE/openscholar
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/fserver/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/fserver/sites /home/$_USERFTP/platforms/$_THIS_CORE/fserver
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/fserver" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/fserver/sites /home/$_USERFTP/platforms/$_THIS_CORE/fserver
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/nodestream-$_NODESTREAM/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/nodestream-$_NODESTREAM/sites /home/$_USERFTP/platforms/$_THIS_CORE/nodestream
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/nodestream" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/nodestream-$_NODESTREAM/sites /home/$_USERFTP/platforms/$_THIS_CORE/nodestream
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/commerce-$_COMMERCE/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/commerce-$_COMMERCE/sites /home/$_USERFTP/platforms/$_THIS_CORE/commerce
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/commerce" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/commerce-$_COMMERCE/sites /home/$_USERFTP/platforms/$_THIS_CORE/commerce
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/drupal_commons-$_COMMONS/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/drupal_commons-$_COMMONS/sites /home/$_USERFTP/platforms/$_THIS_CORE/commons
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/commons" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/drupal_commons-$_COMMONS/sites /home/$_USERFTP/platforms/$_THIS_CORE/commons
+    fi
   fi
   if [ -d "$_ROOT/distro/$_THIS_CORE/$_COCOMORE/sites" ] ; then
-    ln -s $_ROOT/distro/$_THIS_CORE/$_COCOMORE/sites /home/$_USERFTP/platforms/$_THIS_CORE/cocomore
+    if [ ! -L "/home/$_USERFTP/platforms/$_THIS_CORE/cocomore" ] ; then
+      ln -s $_ROOT/distro/$_THIS_CORE/$_COCOMORE/sites /home/$_USERFTP/platforms/$_THIS_CORE/cocomore
+    fi
   fi
 fi
-fi
 if [ ! -d "$_ROOT/static" ] ; then
   mkdir -p $_ROOT/static
   ln -s $_ROOT/static /home/$_USERFTP/static

aegir/barracuda/AegirSetupC.sh.txt

@@ -250,7 +250,8 @@ fi
 
 ###---### Distributions full names
 #
-_F_ACQUIA="Acquia 6.20-svn P.$_THIS_CORE"
+_F_ACQUIA="Acquia 6.20 P.$_THIS_CORE"
+_F_ACQUIA_SEVEN="Acquia 7.0 P.$_THIS_CORE"
 _F_ATRIUM="Atrium 1.0-beta10 P.$_THIS_CORE"
 _F_DRUPAL5="Drupal $_DRUPAL5 P.$_THIS_CORE"
 _F_DRUPAL6="Drupal 6.20 P.$_THIS_CORE"
@@ -445,9 +446,7 @@ mrun "sleep 2"
 _CORE_DISTRO="$_CORE/acquia"
 if [ ! -d "$_CORE_DISTRO" ] ; then
   cd $_CORE
-  mkdir -p $_CORE/acquia
-  cd $_CORE/acquia
-  svn co https://svn.acquia.com/drupal/branches/1.x-6.x . &> /dev/null
+  git clone git://git.acquia.com/drupal/branches/1.x-6.x.git $_CORE/acquia &> /dev/null
   cp -af /data/src/$_THIS_CORE/pressflow-6/* $_CORE/acquia/ &> /dev/null
   cd $_CORE/acquia
   rm -f $_CORE/acquia/*.txt
@@ -465,6 +464,39 @@ else
 fi
 
 
+###---### Acquia Seven
+#
+if [ "$_CLIENT_OPTION" = "CLASSIC" ] ; then
+echo " "
+if prompt_yes_no "$_F_ACQUIA_SEVEN - http://bit.ly/acquiadrupal" ; then
+true
+msg "STATUS: $_F_ACQUIA_SEVEN install in progress, please wait..."
+mrun "sleep 2"
+_CORE_DISTRO="$_CORE/acquia_seven"
+if [ ! -d "$_CORE_DISTRO" ] ; then
+  cd $_CORE
+  git clone git clone git://git.acquia.com/drupal/branches/7.x.git $_CORE/acquia_seven &> /dev/null
+  cd $_CORE/acquia_seven
+  rm -f $_CORE/acquia_seven/*.txt
+  ln -s $_CORE/o_contrib_seven modules/o_contrib_seven
+  rm -f -r $_CORE/acquia_seven/profiles/minimal
+  rm -f -r $_CORE/acquia_seven/profiles/standard
+  rm -f -r $_CORE/acquia_seven/profiles/testing
+  create_dirs
+fi
+mkdir -p $_ROOT/distro/$_THIS_CORE/acquia_seven
+cd $_ROOT/distro/$_THIS_CORE/acquia_seven
+create_symlinks
+create_d7_symlinks
+msg "STATUS: $_F_ACQUIA_SEVEN installation completed"
+mrun "sleep 2"
+else
+  msg "STATUS: $_F_ACQUIA_SEVEN installation skipped"
+  mrun "sleep 1"
+fi
+fi
+
+
 ###---### Open Atrium
 #
 echo " "
@@ -634,37 +666,37 @@ fi
 
 ###---### Cocomore Drupal
 #
-if [ "$_PLATFORMS_ALL" = "YES" ] ; then
-if [ "$_CLIENT_OPTION" = "CLASSIC" ] ; then
-echo " "
-if prompt_yes_no "$_F_COCOMORE - http://drupal.cocomore.com" ; then
-true
-msg "STATUS: $_F_COCOMORE install in progress, please wait..."
-mrun "sleep 2"
-_CORE_DISTRO="$_CORE/$_COCOMORE"
-if [ ! -d "$_CORE_DISTRO" ] ; then
-  cd $_CORE
-  #wget -q -U iCab http://drupal.cocomore.com/system/files/$_COCOMORE.tar.gz
-  wget -q -U iCab http://omega8.cc/dev/$_COCOMORE.tar.gz
-  tar -xzf $_COCOMORE.tar.gz
-  rm -f $_COCOMORE.tar.gz
-  #mv CDC-6.19.0 $_COCOMORE
-  cd $_CORE/$_COCOMORE
-  ln -s $_CORE/o_contrib modules/o_contrib
-  rm -f $_CORE/$_COCOMORE/*.txt
-  create_dirs
-fi
-mkdir -p $_ROOT/distro/$_THIS_CORE/$_COCOMORE
-cd $_ROOT/distro/$_THIS_CORE/$_COCOMORE
-create_symlinks
-msg "STATUS: $_F_COCOMORE installation completed"
-mrun "sleep 2"
-else
-  msg "STATUS: $_F_COCOMORE installation skipped"
-  mrun "sleep 1"
-fi
-fi
-fi
+# if [ "$_PLATFORMS_ALL" = "YES" ] ; then
+# if [ "$_CLIENT_OPTION" = "CLASSIC" ] ; then
+# echo " "
+# if prompt_yes_no "$_F_COCOMORE - http://drupal.cocomore.com" ; then
+# true
+# msg "STATUS: $_F_COCOMORE install in progress, please wait..."
+# mrun "sleep 2"
+# _CORE_DISTRO="$_CORE/$_COCOMORE"
+# if [ ! -d "$_CORE_DISTRO" ] ; then
+#   cd $_CORE
+#   #wget -q -U iCab http://drupal.cocomore.com/system/files/$_COCOMORE.tar.gz
+#   wget -q -U iCab http://omega8.cc/dev/$_COCOMORE.tar.gz
+#   tar -xzf $_COCOMORE.tar.gz
+#   rm -f $_COCOMORE.tar.gz
+#   #mv CDC-6.19.0 $_COCOMORE
+#   cd $_CORE/$_COCOMORE
+#   ln -s $_CORE/o_contrib modules/o_contrib
+#   rm -f $_CORE/$_COCOMORE/*.txt
+#   create_dirs
+# fi
+# mkdir -p $_ROOT/distro/$_THIS_CORE/$_COCOMORE
+# cd $_ROOT/distro/$_THIS_CORE/$_COCOMORE
+# create_symlinks
+# msg "STATUS: $_F_COCOMORE installation completed"
+# mrun "sleep 2"
+# else
+#   msg "STATUS: $_F_COCOMORE installation skipped"
+#   mrun "sleep 1"
+# fi
+# fi
+# fi
 
 
 ###---### Drupal Commons
@@ -959,6 +991,7 @@ rm -f $_CORE/*.tar.gz
 cd $_CORE
 find . -name .svn -exec rm -rf {} \; &> /dev/null
 find . -name .bzr -exec rm -rf {} \; &> /dev/null
+find . -name .git -exec rm -rf {} \; &> /dev/null
 
 
 ###---### Save & verify platforms
@@ -1004,6 +1037,12 @@ if [ -d "$_ROOT/distro/$_THIS_CORE/acquia" ] ; then
     mrun "sleep 5"
   fi
 fi
+if [ -d "$_ROOT/distro/$_THIS_CORE/acquia_seven" ] ; then
+  if [ ! -e "$_ROOT/distro/$_THIS_CORE/acquia_seven/drushrc.php" ] ; then
+    $DRUSHC php-script make_platform "$_F_ACQUIA_SEVEN" acquia $_ROOT/distro/$_THIS_CORE/acquia_seven &> /dev/null
+    mrun "sleep 5"
+  fi
+fi
 if [ -d "$_ROOT/distro/$_THIS_CORE/atrium-$_OPENATRIUM" ] ; then
   if [ ! -e "$_ROOT/distro/$_THIS_CORE/atrium-$_OPENATRIUM/drushrc.php" ] ; then
     $DRUSHC php-script make_platform "$_F_ATRIUM" openatrium $_ROOT/distro/$_THIS_CORE/atrium-$_OPENATRIUM &> /dev/null

aegir/conf/setupmail.txt

@@ -69,6 +69,7 @@ Some new platforms are supported by Aegir Classic only:
  Drupal Commons 1.4 ----------- http://acquia.com/drupalcommons
  OpenScholar 2.0-beta10 ------- http://openscholar.harvard.edu
  ProsePoint 0.37 -------------- http://prosepoint.org
+ Acquia 7.0 ------------------- http://bit.ly/acquiadrupal
 
   Q: How to upgrade from Aegir Mini to Classic?
 

aegir/conf/upgrademail.txt

@@ -49,7 +49,8 @@ Your Aegir control panel is available as before at:
   Drupal Commons 1.4 ----------- http://acquia.com/drupalcommons
   OpenScholar 2.0-beta10 ------- http://openscholar.harvard.edu
   ProsePoint 0.37 -------------- http://prosepoint.org
-
+  Acquia 7.0 ------------------- http://bit.ly/acquiadrupal
+
   Q: How to upgrade from Aegir Mini to Classic?
 
   A: Place a new order at http://omega8.cc/hosted-aegir