Use gitorious as master and github as mirror.

diff --git a/BARRACUDA.sh.txt b/BARRACUDA.sh.txt
index 27ea84c..fa8dba7 100644 (file)
--- a/BARRACUDA.sh.txt
+++ b/BARRACUDA.sh.txt
@@ -13,7 +13,7 @@
 ###  responsibility for any disasters caused
 ###  during the execution of this script.
 ###
-###  Code: http://github.com/omega8cc
+###  Code: http://gitorious.org/aegir
 ###
 ###----------------------------------------###
 
@@ -389,12 +389,12 @@ install_redis_src () {
   cp -p redis-check-dump /usr/bin/
   cp -p redis-check-aof /usr/bin/
   cd /etc/init.d
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/redis-server ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/redis-server ./
   chmod 755 redis-server &> /dev/null
   st_runner "update-rc.d redis-server defaults" &> /dev/null
   mkdir /etc/redis
   cd /etc/redis
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/redis.conf ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/redis.conf ./
   mkdir -p /var/log/redis
   chown redis:redis /var/log/redis
   mkdir -p /var/lib/redis
@@ -412,13 +412,13 @@ force_advanced_nginx_config () {
   cd /var/aegir/config/includes
   mv -f nginx_simple_include.conf nginx_simple_include.conf-$_NOW
   mv -f nginx_advanced_include.conf nginx_advanced_include.conf-$_NOW
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/nginx_advanced_include.conf ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/nginx_advanced_include.conf ./
   cp -af nginx_advanced_include.conf nginx_simple_include.conf
   chown aegir:aegir *
   cd /var/aegir/.drush/provision/http/nginx
   rm -f nginx_simple_include.conf
   rm -f nginx_advanced_include.conf
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/nginx_advanced_include.conf ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/nginx_advanced_include.conf ./
   cp -af nginx_advanced_include.conf nginx_simple_include.conf
   chown aegir:aegir *
 }
@@ -529,11 +529,23 @@ fi
 
 
 ###--------------------###
-if ! netcat -w 8 -z github.com 9418 ; then
+msg "`date` INFO: Testing Gitorious and GitHub servers availability, please wait..."
+sleep 3
+_GITORIOUS_WORKS=YES
+_GITHUB_WORKS=YES
+if ! netcat -w 8 -z gitorious.org 9418 ; then
+  _GITORIOUS_WORKS="NO"
+cat <<EOF
+
+  The Gitorious master repository server doesn't respond now,
+  let's try GitHub mirror...
+    
+EOF
+elif ! netcat -w 8 -z github.com 9418 ; then
   _GITHUB_WORKS="NO"
 cat <<EOF
 
-  The GitHub server doesn't respond now,
+  The GitHub mirror repository server doesn't respond now,
   so we can't continue this installation.
   
   Please try again later.
@@ -545,6 +557,15 @@ EOF
 else
   true
 fi
+if [ $_GITORIOUS_WORKS = "YES" ] ; then
+  _BOA_REPO_NAME="barracuda-octopus"
+  _BOA_REPO_GIT_URL="git://gitorious.org/aegir"
+  msg "`date` INFO: Gitorious master repository will be used for this install"
+elif [ $_GITHUB_WORKS = "YES" ] ; then
+  _BOA_REPO_NAME="nginx-for-drupal"
+  _BOA_REPO_GIT_URL="git://github.com/omega8cc"
+  msg "`date` INFO: GitHub mirror repository will be used for this install"
+fi
 
 
 ###--------------------###
@@ -563,12 +584,12 @@ sleep 3
 #
 # Git clone all
 cd /opt/tmp
-rm -f -r /opt/tmp/nginx-for-drupal
-git clone git://github.com/omega8cc/nginx-for-drupal.git &> /dev/null
+rm -f -r /opt/tmp/$_BOA_REPO_NAME
+git clone $_BOA_REPO_GIT_URL/$_BOA_REPO_NAME.git &> /dev/null
 #
 # Get apt helper
 rm -f apt.conf.noninteractive*
-cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/apt.conf.noninteractive ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/apt.conf.noninteractive ./
 #
 # Create tmp stuff
 _LOG=/opt/tmp/aegir-install.log
@@ -577,13 +598,13 @@ cd $_SRCDIR
 #
 # Get spinner
 rm -f spinner*
-cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/spinner ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/spinner ./
 chmod +x spinner &> /dev/null
 #
 # Get axelerator
 if [ ! -e "/usr/bin/apt-fast" ] ; then
   cd /usr/bin
-  cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/apt-fast.sh.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/apt-fast.sh.txt ./
   mv -f apt-fast.sh.txt apt-fast &> /dev/null
   chmod +x apt-fast &> /dev/null
   cd /opt/tmp
@@ -892,7 +913,7 @@ if [ $_INSTALL_PDNSD = "YES" ] ; then
     cp -a /etc/resolv.conf /var/backups/resolv.conf.bak
     st_runner "$_INSTALL pdnsd resolvconf";
     perl -p -i -e "s/START_DAEMON=no/START_DAEMON=yes/g" /etc/default/pdnsd
-    cat /opt/tmp/nginx-for-drupal/aegir/conf/pdnsd.conf > /etc/pdnsd.conf
+    cat /opt/tmp/$_BOA_REPO_NAME/aegir/conf/pdnsd.conf > /etc/pdnsd.conf
     st_runner "invoke-rc.d pdnsd stop" &> /dev/null
     rm -f /var/cache/pdnsd/pdnsd.cache
     st_runner "invoke-rc.d pdnsd start" &> /dev/null
@@ -915,7 +936,7 @@ if [ ! -e "/var/log/apt-fast-install-log.txt" ] ; then
     if [ -z "$_LOCAL_UBUNTU_MIRROR" ] ; then
       msg "`date` INFO: Now looking for the best/fastest $_THIS_OS mirror, it can take a while, please wait..."
       mrun "sleep 3"
-      cd /opt/tmp/nginx-for-drupal/aegir/helpers
+      cd /opt/tmp/$_BOA_REPO_NAME/aegir/helpers
       _MIRROR=`bash ffmirror.sh.txt < apt-list-ubuntu.txt`
       _MIRROR=`bash ffmirror.sh.txt < apt-list-ubuntu.txt`
       echo " "
@@ -951,7 +972,7 @@ if [ ! -e "/var/log/apt-fast-install-log.txt" ] ; then
     if [ -z "$_LOCAL_DEBIAN_MIRROR" ] ; then
       msg "`date` INFO: Now looking for the best/fastest $_THIS_OS mirror, it can take a while, please wait..."
       mrun "sleep 3"
-      cd /opt/tmp/nginx-for-drupal/aegir/helpers
+      cd /opt/tmp/$_BOA_REPO_NAME/aegir/helpers
       _MIRROR=`bash ffmirror.sh.txt < apt-list-debian.txt`
       _MIRROR=`bash ffmirror.sh.txt < apt-list-debian.txt`
       echo " "
@@ -1116,7 +1137,7 @@ if [[ $_X_INIT_TEST =~ Barracuda ]] ; then
 else
   cd /etc/init.d
   mv -f /etc/init.d/nginx /var/backups/nginx-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/nginx ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/nginx ./
   chmod 755 /etc/init.d/nginx &> /dev/null
   msg "`date` INFO: Fix for Nginx startup script applied"
 fi
@@ -1176,7 +1197,7 @@ if [ -d "/var/xdrago" ] ; then
 fi
 if [ $_STATUS = "INIT" ] ; then
   mkdir -p ./xdrago
-  cp -af /opt/tmp/nginx-for-drupal/aegir/tools/auto-healing-monitoring/* ./xdrago/
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/tools/auto-healing-monitoring/* ./xdrago/
   cp -af /var/xdrago/etc /opt/
   cp -af /opt/etc/init.d/* /etc/init.d/
   cp -af /var/xdrago/cron/crontabs/root /var/spool/cron/crontabs/
@@ -1431,7 +1452,7 @@ if [ $_NGINX_INSTALL_REQUIRED = "YES" ] ; then
   msg "`date` INFO: Install/upgrade Nginx, please wait..."
   mrun "sleep 3"
   cd /var/opt; rm -f -r nginx*
-  git clone git://github.com/masterzen/nginx-upload-progress-module.git &> /dev/null
+  git clone git://gitorious.org/aegir/nginx-upload-progress-module.git &> /dev/null
   cd /var/opt
   wget -q -U iCab http://sysoev.ru/nginx/nginx-$_NGINX_VERSION.tar.gz
   tar -xzf nginx-$_NGINX_VERSION.tar.gz
@@ -1482,7 +1503,7 @@ if [ ! -e "$_PATH_LSHELL" ] ; then
   chown :lshellg /var/log/lsh
   chmod 770 /var/log/lsh &> /dev/null
   cd /etc
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/lshell.conf.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/lshell.conf.txt ./
   mv -f lshell.conf lshell.conf-pre-$_NOW &> /dev/null
   mv -f lshell.conf.txt lshell.conf &> /dev/null
   echo "$_PATH_LSHELL" >> /etc/shells
@@ -1509,13 +1530,13 @@ if [ ! -e "/usr/local/sbin/pure-config.pl" ] ; then
   st_runner "sh ./configure --with-everything --with-virtualchroot --without-humor --with-tls --with-diraliases --with-pam --with-certfile=/etc/ssl/private/pure-ftpd.pem" 2> /dev/null
   st_runner "make install-strip" 2> /dev/null
   cd /usr/local/sbin/
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/pure-config.pl.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/pure-config.pl.txt ./
   mv -f pure-config.pl.txt pure-config.pl &> /dev/null
   chmod 755 /usr/local/sbin/pure-config.pl &> /dev/null
   cp -f /var/opt/pure-ftpd-1.0.29/pam/pure-ftpd /etc/pam.d/
   cd /usr/local/etc
   rm -f pure-ftpd.conf
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/pure-ftpd.conf ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/pure-ftpd.conf ./
   mrun "sleep 3"
   st_runner "/usr/local/sbin/pure-config.pl /usr/local/etc/pure-ftpd.conf" &> /dev/null
   cd /var/opt
@@ -1543,7 +1564,7 @@ if [ $_STATUS = "INIT" ] ; then
   fi
   cd /etc/mysql
   mv -f my.cnf my.cnf.bak.copy &> /dev/null
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/my.cnf.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/my.cnf.txt ./
   mv -f my.cnf.txt my.cnf &> /dev/null
   st_runner "invoke-rc.d mysql restart" &> /dev/null
 else
@@ -1610,7 +1631,13 @@ elif [ "$_AEGIR_VERSION" = "TEST" ] ; then
 else
   _AEGIR_SCRIPT="aegir-alpha-install"
 fi
-cp -af /opt/tmp/nginx-for-drupal/aegir/scripts/$_AEGIR_SCRIPT.sh.txt ./
+for Files in `find /opt/tmp/$_BOA_REPO_NAME/aegir/scripts -type f`
+do
+  perl -p -i -e "s/(EDIT_DRUSH_VERSION)/$_DRUSH_VERSION/g" $Files
+  perl -p -i -e "s/(EDIT_BOA_REPO_NAME)/$_BOA_REPO_NAME/g" $Files
+  perl -p -i -e "s/(EDIT_BOA_REPO_GIT_URL)/$_BOA_REPO_GIT_URL/g" $Files
+done
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/scripts/$_AEGIR_SCRIPT.sh.txt ./
 msg "`date` INFO: Now running Aegir installer for backend and frontend, please wait..."
 mrun "sleep 3"
 if [ "$_DEBUG_MODE" = "YES" ] ; then
@@ -1647,11 +1674,11 @@ mrun "sleep 3"
 ln -s /var/aegir/drush/drush /usr/bin/drush
 cd /var/aegir/config/includes
 mv -f global.inc global.inc-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
-cp -af /opt/tmp/nginx-for-drupal/aegir/conf/global.inc.aegir.txt ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.aegir.txt ./
 mv -f global.inc.aegir.txt global.inc &> /dev/null
 force_advanced_nginx_config
 cd /var/aegir/drush
-cp -af /opt/tmp/nginx-for-drupal/aegir/patches/user.drush.inc.patch ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/user.drush.inc.patch ./
 patch -p0 < user.drush.inc.patch &> /dev/null
 cd /var/aegir
 perl -p -i -e "s/(access_log)/\#access_log/g" /etc/nginx/nginx.conf
@@ -1675,18 +1702,22 @@ else
     rm -f /opt/tmp/testecho*
     invoke-rc.d cron stop &> /dev/null
     cd /var/aegir
-    cp /opt/tmp/nginx-for-drupal/aegir/barracuda/AegirUpgrade.sh.txt ./
-    perl -p -i -e "s/(EDIT_DOMAIN)/$_THIS_FRONT/g" /var/aegir/AegirUpgrade.sh.txt
-    perl -p -i -e "s/(EDIT_AEGIR_VERSION)/$_AEGIR_VERSION/g" /var/aegir/AegirUpgrade.sh.txt
-    perl -p -i -e "s/(EDIT_DRUSH_VERSION)/$_DRUSH_VERSION/g" /var/aegir/AegirUpgrade.sh.txt
+    cp /opt/tmp/$_BOA_REPO_NAME/aegir/barracuda/AegirUpgrade.sh.txt ./
+    perl -p -i -e "s/(EDIT_INSTALLER_VERSION)/$_INSTALLER_VERSION/g" /var/aegir/AegirUpgrade.sh.txt
+    perl -p -i -e "s/(EDIT_BOA_REPO_NAME)/$_BOA_REPO_NAME/g"         /var/aegir/AegirUpgrade.sh.txt
+    perl -p -i -e "s/(EDIT_BOA_REPO_GIT_URL)/$_BOA_REPO_GIT_URL/g"   /var/aegir/AegirUpgrade.sh.txt
+    perl -p -i -e "s/(EDIT_DOMAIN)/$_THIS_FRONT/g"                   /var/aegir/AegirUpgrade.sh.txt
+    perl -p -i -e "s/(EDIT_AEGIR_VERSION)/$_AEGIR_VERSION/g"         /var/aegir/AegirUpgrade.sh.txt
+    perl -p -i -e "s/(EDIT_DRUSH_VERSION)/$_DRUSH_VERSION/g"         /var/aegir/AegirUpgrade.sh.txt
+    perl -p -i -e "s/(EDIT_DEBUG_MODE)/$_DEBUG_MODE/g"               /var/aegir/AegirUpgrade.sh.txt
     su -s /bin/bash aegir -c "/bin/bash AegirUpgrade.sh.txt"
     cd /var/aegir/config/includes
     mv -f global.inc global.inc-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
     if [ -e "/var/aegir/config/server_master/nginx/pre.d/nginx_wild_ssl.conf" ] ; then
-      cp -af /opt/tmp/nginx-for-drupal/aegir/conf/global.inc.ssl.aegir.txt ./
+      cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.ssl.aegir.txt ./
       mv -f global.inc.ssl.aegir.txt global.inc &> /dev/null
     else
-      cp -af /opt/tmp/nginx-for-drupal/aegir/conf/global.inc.aegir.txt ./
+      cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.aegir.txt ./
       mv -f global.inc.aegir.txt global.inc &> /dev/null    
     fi
     force_advanced_nginx_config
@@ -1712,15 +1743,15 @@ fi ### end of if [ $_STATUS = "INIT" ] ; then
 
 
 ###--------------------###
-if [ -e "/opt/tmp/nginx-for-drupal/aegir/conf/mime.types" ] ; then
+if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/mime.types" ] ; then
 msg "`date` INFO: Fix for mime types in Nginx, please wait..."
 mrun "sleep 3"
   cd /etc/nginx
   mv -f mime.types mime.types-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
-  cp /opt/tmp/nginx-for-drupal/aegir/conf/mime.types ./ &> /dev/null
+  cp /opt/tmp/$_BOA_REPO_NAME/aegir/conf/mime.types ./ &> /dev/null
   cd /var/www/nginx-default
-  cp -f /opt/tmp/nginx-for-drupal/aegir/conf/uc.html ./ &> /dev/null
-  cp -f /opt/tmp/nginx-for-drupal/aegir/conf/under_construction.jpg ./ &> /dev/null
+  cp -f /opt/tmp/$_BOA_REPO_NAME/aegir/conf/uc.html ./ &> /dev/null
+  cp -f /opt/tmp/$_BOA_REPO_NAME/aegir/conf/under_construction.jpg ./ &> /dev/null
   mv -f index.html index.html-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
   mv -f uc.html index.html &> /dev/null
   if [ ! -e "/var/run/aegir_upgrade.pid" ] ; then
@@ -1780,11 +1811,11 @@ mrun "sleep 30"
     fi
     openssl req -x509 -nodes -days 7300 -subj "/C=US/ST=New York/O=Aegir/OU=Cloud/L=New York/CN=*.$_THISHOST" -newkey rsa:2048 -keyout /etc/ssl/private/nginx-wild-ssl.key -out /etc/ssl/private/nginx-wild-ssl.crt -batch 2> /dev/null
     cd /var/aegir/config/server_master/nginx/pre.d
-    cp -a /opt/tmp/nginx-for-drupal/aegir/conf/nginx_wild_ssl.conf ./ &> /dev/null
+    cp -a /opt/tmp/$_BOA_REPO_NAME/aegir/conf/nginx_wild_ssl.conf ./ &> /dev/null
     perl -p -i -e "s/127.0.0.1/$_THISHTIP/g" /var/aegir/config/server_master/nginx/pre.d/nginx_wild_ssl.conf &> /dev/null
-    if [ -e "/opt/tmp/nginx-for-drupal/aegir/conf/global.inc.ssl.aegir.txt" ] ; then
+    if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.ssl.aegir.txt" ] ; then
       cd /var/aegir/config/includes
-      cp -af /opt/tmp/nginx-for-drupal/aegir/conf/global.inc.ssl.aegir.txt ./ &> /dev/null
+      cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.ssl.aegir.txt ./ &> /dev/null
       mv -f global.inc global.inc-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
       mv -f global.inc.ssl.aegir.txt global.inc &> /dev/null
     fi
@@ -1949,7 +1980,7 @@ if [ ! -e "/usr/sbin/named" ] ; then
     st_runner "$_INSTALL bind9" 2> /dev/null
     cd /etc/bind
     rm -f named.conf.options
-    cp -af /opt/tmp/nginx-for-drupal/aegir/conf/named.conf.options ./ &> /dev/null
+    cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/named.conf.options ./ &> /dev/null
     perl -p -i -e "s/127.0.1.1/$_THISHTIP/g" named.conf.options
     st_runner "invoke-rc.d bind9 restart" &> /dev/null
     if [ ! -e "/etc/init.d/bind" ] ; then
@@ -1999,7 +2030,7 @@ if [ ! -e "/var/run/cloud_vhost.pid" ] ; then
   st_runner "sh install.sh" 2> /dev/null
   cd /etc/csf
   mv -f csf.conf csf.conf-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/csf.conf ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/csf.conf ./
   sed -i "s/notify\@omega8.cc/$_MY_EMAIL/g" csf.conf
   chmod 600 csf.conf &> /dev/null
   sed -i "s/30 \* \* \* \* bash/#30 * * * * bash/g" /var/spool/cron/crontabs/root

diff --git a/OCTOPUS.sh.txt b/OCTOPUS.sh.txt
index fe8a578..a9a5219 100644 (file)
--- a/OCTOPUS.sh.txt
+++ b/OCTOPUS.sh.txt
@@ -13,7 +13,7 @@
 ###  responsibility for any disasters caused
 ###  during the execution of this script.
 ###
-###  Code: http://github.com/omega8cc
+###  Code: http://gitorious.org/aegir
 ###
 ###----------------------------------------###
 
@@ -249,7 +249,7 @@ prompt_yes_no () {
 ###---### action
 #
 action () {
-for Files in `find /opt/tmp/nginx-for-drupal/aegir/barracuda -type f`
+for Files in `find /opt/tmp/$_BOA_REPO_NAME/aegir/barracuda -type f`
 do
   perl -p -i -e "s/(EDIT_DOMAIN)/$_DOMAIN/g" $Files
   perl -p -i -e "s/(EDIT_THISHTIP)/$_THISHTIP/g" $Files
@@ -281,13 +281,21 @@ do
   perl -p -i -e "s/(EDIT_USE_CURRENT)/$_USE_CURRENT/g" $Files
   perl -p -i -e "s/(EDIT_REMOTE_CACHE_IP)/$_REMOTE_CACHE_IP/g" $Files
   perl -p -i -e "s/(EDIT_DEBUG_MODE)/$_DEBUG_MODE/g" $Files
+  perl -p -i -e "s/(EDIT_BOA_REPO_NAME)/$_BOA_REPO_NAME/g" $Files
+  perl -p -i -e "s/(EDIT_BOA_REPO_GIT_URL)/$_BOA_REPO_GIT_URL/g" $Files
+done
+for Files in `find /opt/tmp/$_BOA_REPO_NAME/aegir/scripts -type f`
+do
+  perl -p -i -e "s/(EDIT_DRUSH_VERSION)/$_DRUSH_VERSION/g" $Files
+  perl -p -i -e "s/(EDIT_BOA_REPO_NAME)/$_BOA_REPO_NAME/g" $Files
+  perl -p -i -e "s/(EDIT_BOA_REPO_GIT_URL)/$_BOA_REPO_GIT_URL/g" $Files
 done
 if [ $_STATUS = "INIT" ] ; then
-  cp -f /opt/tmp/nginx-for-drupal/aegir/barracuda/run-xdrago /var/xdrago/run-$_USER
+  cp -f /opt/tmp/$_BOA_REPO_NAME/aegir/barracuda/run-xdrago /var/xdrago/run-$_USER
   chmod 700 /var/xdrago/run-$_USER &> /dev/null
 fi
-chmod 700 /opt/tmp/nginx-for-drupal/aegir/barracuda/* &> /dev/null
-bash /opt/tmp/nginx-for-drupal/aegir/barracuda/AegirSetupA.sh.txt
+chmod 700 /opt/tmp/$_BOA_REPO_NAME/aegir/barracuda/* &> /dev/null
+bash /opt/tmp/$_BOA_REPO_NAME/aegir/barracuda/AegirSetupA.sh.txt
 if [ ! -e "/data/disk/$_USER/log/email.txt" ] ; then
   echo $_CLIENT_EMAIL > /data/disk/$_USER/log/email.txt
 fi
@@ -297,18 +305,19 @@ fi
 if [ ! -e "/data/disk/$_USER/log/subscr.txt" ] ; then
   echo $_CLIENT_SUBSCR > /data/disk/$_USER/log/subscr.txt
 fi
-rm -f -r /opt/tmp/nginx-for-drupal
+rm -f -r /opt/tmp/$_BOA_REPO_NAME
 }
 
 
 ###---### init
 #
-invoke-rc.d pdnsd stop &> /dev/null
-sleep 1
-rm -f /var/cache/pdnsd/pdnsd.cache
-sleep 1
-invoke-rc.d pdnsd start &> /dev/null
-
+if [ -d "/var/cache/pdnsd" ] ; then
+  invoke-rc.d pdnsd stop &> /dev/null
+  sleep 1
+  rm -f /var/cache/pdnsd/pdnsd.cache
+  sleep 1
+  invoke-rc.d pdnsd start &> /dev/null
+fi
 if [ ! -z "$_LOCAL_NETWORK_IP" ] ; then
   _DNS_SETUP_TEST=NO
   _DEBUG_MODE=YES
@@ -316,11 +325,24 @@ if [ ! -z "$_LOCAL_NETWORK_IP" ] ; then
 fi
 #
 #
-if ! netcat -w 8 -z github.com 9418 ; then
+###--------------------###
+msg "`date` INFO: Testing Gitorious and GitHub servers availability, please wait..."
+sleep 3
+_GITORIOUS_WORKS=YES
+_GITHUB_WORKS=YES
+if ! netcat -w 8 -z gitorious.org 9418 ; then
+  _GITORIOUS_WORKS="NO"
+cat <<EOF
+
+  The Gitorious master repository server doesn't respond now,
+  let's try GitHub mirror...
+    
+EOF
+elif ! netcat -w 8 -z github.com 9418 ; then
   _GITHUB_WORKS="NO"
 cat <<EOF
 
-  The GitHub server doesn't respond now,
+  The GitHub mirror repository server doesn't respond now,
   so we can't continue this installation.
   
   Please try again later.
@@ -332,6 +354,15 @@ EOF
 else
   true
 fi
+if [ $_GITORIOUS_WORKS = "YES" ] ; then
+  _BOA_REPO_NAME="barracuda-octopus"
+  _BOA_REPO_GIT_URL="git://gitorious.org/aegir"
+  msg "`date` INFO: Gitorious master repository will be used for this install"
+elif [ $_GITHUB_WORKS = "YES" ] ; then
+  _BOA_REPO_NAME="nginx-for-drupal"
+  _BOA_REPO_GIT_URL="git://github.com/omega8cc"
+  msg "`date` INFO: GitHub mirror repository will be used for this install"
+fi
 #
 #
 if [ `whoami` = "root" ] ; then
@@ -366,13 +397,13 @@ _SRCDIR=/opt/tmp/files
 mkdir -p $_SRCDIR
 chmod -R 777 /opt/tmp &> /dev/null
 cd /opt/tmp
-rm -f -r /opt/tmp/nginx-for-drupal
-git clone git://github.com/omega8cc/nginx-for-drupal.git &> /dev/null
+rm -f -r /opt/tmp/$_BOA_REPO_NAME
+git clone $_BOA_REPO_GIT_URL/$_BOA_REPO_NAME.git &> /dev/null
 #
 # Get spinner
 cd $_SRCDIR
 rm -f spinner*
-cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/spinner ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/spinner ./
 chmod +x spinner &> /dev/null
 #
 # Create tmp stuff

diff --git a/aegir/barracuda/AegirSetupA.sh.txt b/aegir/barracuda/AegirSetupA.sh.txt
index e22eb9d..15abe5d 100644 (file)
--- a/aegir/barracuda/AegirSetupA.sh.txt
+++ b/aegir/barracuda/AegirSetupA.sh.txt
@@ -13,7 +13,7 @@
 ###  responsibility for any disasters caused
 ###  during the execution of this script.
 ###
-###  Code: http://github.com/omega8cc
+###  Code: http://gitorious.org/aegir
 ###
 ###----------------------------------------###
 
@@ -66,6 +66,8 @@ _USE_CURRENT=EDIT_USE_CURRENT
 _REMOTE_CACHE_IP=EDIT_REMOTE_CACHE_IP
 _DEBUG_MODE=EDIT_DEBUG_MODE
 _NOW=`date +%y%m%d-%H%M`
+_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
+_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
 
 
 ###---### Functions
@@ -245,8 +247,8 @@ msg "`date` $_STATUS A: Prepare scripts, please wait..."
 mrun "sleep 3"
 chmod 0711 $_ROOT
 cd $_ROOT
-cp -af /opt/tmp/nginx-for-drupal/aegir/barracuda/AegirSetupB.sh.txt ./
-cp -af /opt/tmp/nginx-for-drupal/aegir/barracuda/AegirSetupC.sh.txt ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/barracuda/AegirSetupB.sh.txt ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/barracuda/AegirSetupC.sh.txt ./
 chown $_USER:$_USRG $_ROOT/AegirSetupB.sh.txt &> /dev/null
 chown $_USER:$_USRG $_ROOT/AegirSetupC.sh.txt &> /dev/null
 
@@ -345,7 +347,7 @@ if [ $_LOCAL_STATUS = "INIT" ] ; then
     runner "invoke-rc.d nginx reload" 2> /dev/null
   fi
   cd $_AEGIR_ROOT
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/robots.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/robots.txt ./
   cd $_ROOT
   msg "`date` $_STATUS A: post-install completed"
 fi
@@ -359,13 +361,13 @@ fi
   cd $_ROOT/config/includes
   mv -f nginx_simple_include.conf nginx_simple_include.conf-$_NOW
   mv -f nginx_advanced_include.conf nginx_advanced_include.conf-$_NOW
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/nginx_advanced_include.conf ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/nginx_advanced_include.conf ./
   cp -af nginx_advanced_include.conf nginx_simple_include.conf
   chown $_USER:$_USRG * &> /dev/null
   cd $_ROOT/.drush/provision/http/nginx
   rm -f nginx_simple_include.conf
   rm -f nginx_advanced_include.conf
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/nginx_advanced_include.conf ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/nginx_advanced_include.conf ./
   cp -af nginx_advanced_include.conf nginx_simple_include.conf
   chown $_USER:$_USRG * &> /dev/null
   echo "$_NOW" >> $_ROOT/config/includes/nginx_advanced_force.log.$_INSTALLER_VERSION
@@ -375,7 +377,7 @@ fi
 ###---### Forced SSL settings
 #
 if [ -e "/var/aegir/config/server_master/nginx/pre.d/nginx_wild_ssl.conf" ] ; then
-  if [ -e "/opt/tmp/nginx-for-drupal/aegir/conf/global.inc.ssl.aegir.txt" ] ; then
+  if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.ssl.aegir.txt" ] ; then
     _SSL_TEST=`cat /data/conf/global.inc 2>&1`
     if [[ $_SSL_TEST =~ HTTP_X_FORWARDED_PROTO ]] ; then
       _SSL_TEST=OK
@@ -383,7 +385,7 @@ if [ -e "/var/aegir/config/server_master/nginx/pre.d/nginx_wild_ssl.conf" ] ; th
       msg "`date` $_STATUS A: Installing forced SSL settings for this Hostmaster site, please wait..."
       mrun "sleep 3"
       cd /data/conf
-      cp -af /opt/tmp/nginx-for-drupal/aegir/conf/global.inc.ssl.aegir.txt ./
+      cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.ssl.aegir.txt ./
       mv -f global.inc global.inc-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
       mv -f global.inc.ssl.aegir.txt global.inc &> /dev/null
       if [ ! -e "/var/run/aegir_upgrade.pid" ] ; then
@@ -506,12 +508,17 @@ _LOCAL_STATUS="$_STATUS"
 if [ -e "/var/run/aegir_upgrade.pid" ] ; then
   _LOCAL_STATUS=INIT
 fi
-if [ $_LOCAL_STATUS = "INIT" ] ; then
- msg "`date` $_STATUS A: Add cron task"
- mrun "sleep 3"
- echo -e "*/1 * * * * bash /var/xdrago/run-$_USER >/dev/null 2>&1" | tee -a /var/spool/cron/crontabs/root >/dev/null 2>&1
-fi
+# if [ $_LOCAL_STATUS = "INIT" ] ; then
+#  msg "`date` $_STATUS A: Add cron task"
+#  mrun "sleep 3"
+#  echo -e "*/1 * * * * bash /var/xdrago/run-$_USER >/dev/null 2>&1" | tee -a /var/spool/cron/crontabs/root >/dev/null 2>&1
+# fi
 rm -f /var/spool/cron/crontabs/$_USER
+if [ ! -e "/var/log/cron_aegir_off.pid" ] ; then
+  sed -i "s/\*\/1 \* \* \* \* bash \/var\/xdrago\/run/#*\/1 * * * * bash \/var\/xdrago\/run/g" /var/spool/cron/crontabs/root
+  echo -e "*/2 * * * * bash /var/xdrago/runner.sh >/dev/null 2>&1" | tee -a /var/spool/cron/crontabs/root >/dev/null 2>&1
+  touch /var/log/cron_aegir_off.pid
+fi
 
 
 ###---### Add ftps/lshell access
@@ -668,7 +675,7 @@ if [ -e "$_ROOT/log/setupmail.txt" ] ; then
     if [ -e "$_ROOT/log/upgrademail.txt" ] ; then
       mv -f $_ROOT/log/upgrademail.txt $_ROOT/log/upgrademail-pre-$_THIS_CORE.txt &> /dev/null
     fi
-    cp -af /opt/tmp/nginx-for-drupal/aegir/conf/upgrademail.txt ./
+    cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/upgrademail.txt ./
     perl -p -i -e "s/(aegir.dragon.ny.host8.biz)/$_DOMAIN/g" $_ROOT/log/upgrademail.txt
     perl -p -i -e "s/(dragon)/$_USER/g" $_ROOT/log/upgrademail.txt
     perl -p -i -e "s/(FN8rXcQn)/$_PASWD/g" $_ROOT/log/upgrademail.txt
@@ -678,7 +685,7 @@ if [ -e "$_ROOT/log/setupmail.txt" ] ; then
   fi
 elif [ $_STATUS = "INIT" ] ; then
  cd $_ROOT/log
- cp -af /opt/tmp/nginx-for-drupal/aegir/conf/setupmail.txt ./
+ cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/setupmail.txt ./
  perl -p -i -e "s/(aegir.dragon.ny.host8.biz)/$_DOMAIN/g" $_ROOT/log/setupmail.txt
  perl -p -i -e "s/(dragon)/$_USER/g" $_ROOT/log/setupmail.txt
  perl -p -i -e "s/(FN8rXcQn)/$_PASWD/g" $_ROOT/log/setupmail.txt

diff --git a/aegir/barracuda/AegirSetupB.sh.txt b/aegir/barracuda/AegirSetupB.sh.txt
index c4cc31e..d343e08 100644 (file)
--- a/aegir/barracuda/AegirSetupB.sh.txt
+++ b/aegir/barracuda/AegirSetupB.sh.txt
@@ -13,7 +13,7 @@
 ###  responsibility for any disasters caused
 ###  during the execution of this script.
 ###
-###  Code: http://github.com/omega8cc
+###  Code: http://gitorious.org/aegir
 ###
 ###----------------------------------------###
 
@@ -59,6 +59,8 @@ _AEGIR_VERSION=EDIT_AEGIR_VERSION
 _DRUSH_VERSION=EDIT_DRUSH_VERSION
 _DEBUG_MODE=EDIT_DEBUG_MODE
 _NOW=`date +%y%m%d-%H%M`
+_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
+_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
 
 
 ###---### Functions
@@ -248,8 +250,7 @@ msg "`date` $_STATUS B: Installing provision backend in $_ROOT/.drush"
 mkdir -p $_ROOT/.drush
 cd $_ROOT/.drush
 if [ $_AEGIR_VERSION = "HEAD" ]; then  
-  #git clone git://git.aegirproject.org/provision &> /dev/null
-  git clone git://github.com/omega8cc/provision.git &> /dev/null
+  git clone $_BOA_REPO_GIT_URL/provision.git &> /dev/null
   if [ $_STATUS = "UPGRADE" ] ; then
     wget -q -U iCab http://ftp.drupal.org/files/projects/drush_make-6.x-2.0-beta8.tar.gz
     tar -xzf drush_make-6.x-2.0-beta8.tar.gz
@@ -269,7 +270,7 @@ cd $_ROOT/.drush
 git clone git://git.koumbit.net/drupal/contrib/modules/provision_boost &> /dev/null
 if [ $_STATUS = "UPGRADE" ] ; then
   cd $_ROOT/.drush/drush_make
-  cp -af /opt/tmp/nginx-for-drupal/aegir/patches/drush_make.drush.inc.patch ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/drush_make.drush.inc.patch ./
   patch -p0 < drush_make.drush.inc.patch &> /dev/null
 fi
 
@@ -342,14 +343,14 @@ fi
 msg "`date` $_STATUS B: Enhance Aegir UI"
 mrun "sleep 3"
 cd $_AEGIR_ROOT/profiles/hostmaster/themes/eldir
-cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/eldir.diff ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/eldir.diff ./
 patch -p1 <./eldir.diff &> /dev/null
 mkdir -p $_AEGIR_ROOT/sites/all/modules
 cd $_AEGIR_ROOT/sites/all/modules
 wget -q -U iCab http://omega8.cc/dev/aegir_custom_settings-6.x-1.4.tar.gz
 tar -xzf aegir_custom_settings-6.x-1.4.tar.gz
 cd $_ROOT/tools/drush
-cp -af /opt/tmp/nginx-for-drupal/aegir/patches/user.drush.inc.patch ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/user.drush.inc.patch ./
 patch -p0 < user.drush.inc.patch &> /dev/null
 cd $_AEGIR_ROOT/sites/$_DOMAIN
 $_DRUSHCMD dl features -y &> /dev/null
@@ -377,11 +378,11 @@ perl -p -i -e "s/(320px)/640px/g" $_AEGIR_ROOT/profiles/hostmaster/themes/eldir/
 if [ -e "$_AEGIR_ROOT/sites/$_DOMAIN/settings.php" ] ; then
   cd $_AEGIR_ROOT/sites/$_DOMAIN
   DRUSHC="$_ROOT/tools/drush/drush"
-  cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/make_home.php.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_home.php.txt ./
   mv -f make_home.php.txt make_home.php &> /dev/null
   $DRUSHC php-script make_home &> /dev/null
   rm -f make_home.php
-  cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/make_client.php.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_client.php.txt ./
   mv -f make_client.php.txt make_client.php &> /dev/null
   $DRUSHC php-script make_client $_CLIENT_EMAIL &> /dev/null
   rm -f make_client.php
@@ -400,7 +401,7 @@ if [ -e "/data/conf/global.inc" ] ; then
 else
   rm -f $_ROOT/config/includes/global.inc
   cd /data/conf
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/global.inc.aegir.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/global.inc.aegir.txt ./
   mv -f global.inc.aegir.txt global.inc &> /dev/null
   ln -s /data/conf/global.inc $_ROOT/config/includes/global.inc
 fi

diff --git a/aegir/barracuda/AegirSetupC.sh.txt b/aegir/barracuda/AegirSetupC.sh.txt
index f7cb305..c38b022 100644 (file)
--- a/aegir/barracuda/AegirSetupC.sh.txt
+++ b/aegir/barracuda/AegirSetupC.sh.txt
@@ -13,7 +13,7 @@
 ###  responsibility for any disasters caused
 ###  during the execution of this script.
 ###
-###  Code: http://github.com/omega8cc
+###  Code: http://gitorious.org/aegir
 ###
 ###----------------------------------------###
 
@@ -61,6 +61,8 @@ _ROOT="/data/disk/$_USER"
 _AEGIR_ROOT="$_ROOT/aegir/distro/$_HM_DISTRO"
 _PREV_AEGIR_ROOT="$_ROOT/aegir/distro/$_LAST_HMR"
 _DEBUG_MODE=EDIT_DEBUG_MODE
+_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
+_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
 
 
 ###---### Functions
@@ -143,7 +145,7 @@ mrun () {
 #
 # create standard directories
 create_dirs () {
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/robots.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/robots.txt ./
   mkdir -p ./sites/default/files
   mkdir -p ./cache/perm
   mkdir -p ./cache/normal
@@ -169,9 +171,9 @@ create_dirs () {
   chmod 02775 ./sites/all/libraries &> /dev/null
   chmod 02775 ./sites/all/themes &> /dev/null
   rm -f .htaccess
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/get.htaccess.txt ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/get.htaccess.txt ./
   mv -f get.htaccess.txt .htaccess &> /dev/null
-  cp -af /opt/tmp/nginx-for-drupal/aegir/conf/crossdomain.xml ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/crossdomain.xml ./
 }
 #
 # create standard symlinks
@@ -277,8 +279,8 @@ for i in $REVISIONS; do
       cd /data/all/$i/fserver/profiles/feature_server
       rm -f feature_server.make
       rm -f feature_server.profile
-      wget --no-check-certificate -q -U iCab https://github.com/omega8cc/feature_server/raw/master/feature_server.make
-      wget --no-check-certificate -q -U iCab https://github.com/omega8cc/feature_server/raw/master/feature_server.profile
+      wget -q -U iCab http://gitorious.org/aegir/feature_server/blobs/raw/master/feature_server.make
+      wget -q -U iCab http://gitorious.org/aegir/feature_server/blobs/raw/master/feature_server.profile
       if [ -e "$_ROOT/.drush/hostmaster.alias.drushrc.php" ] ; then
         _THIS_HOSTMASTER=`cat $_ROOT/.drush/hostmaster.alias.drushrc.php | grep 'site_path' | cut -d: -f2 | awk '{ print $3}'`
         _THIS_HOSTMASTER=`echo $_THIS_HOSTMASTER | sed "s/[\,']//g"`
@@ -306,7 +308,7 @@ rm -f /data/src/$_THIS_CORE/pressflow-6/*.txt
 rm -f /data/src/$_THIS_CORE/pressflow-6/modules/*.txt
 rm -f /data/src/$_THIS_CORE/pressflow-6/themes/*.txt
 rm -f /data/src/$_THIS_CORE/pressflow-6/sites/all/*.txt
-cp -af /opt/tmp/nginx-for-drupal/aegir/conf/robots.txt ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/robots.txt ./
 wget -q -U iCab http://omega8.cc/boost_stats.php.txt
 mv -f boost_stats.php.txt boost_stats.php &> /dev/null
 if [ ! -d "$_CORE/o_contrib" ] ; then
@@ -777,16 +779,16 @@ if [ ! -d "$_CORE_DISTRO" ] ; then
   cd $_CORE/openscholar-$_OPENSCHOLAR
   rm -f $_CORE/openscholar-$_OPENSCHOLAR/*.txt
   cd $_CORE/openscholar-$_OPENSCHOLAR/profiles/openscholar
-  cp -af /opt/tmp/nginx-for-drupal/aegir/patches/openscholar.profile.patch ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/openscholar.profile.patch ./
   patch -p1 < openscholar.profile.patch &> /dev/null
   cd $_CORE/openscholar-$_OPENSCHOLAR/profiles/openscholar_projects
-  cp -af /opt/tmp/nginx-for-drupal/aegir/patches/openscholar_projects.profile.patch ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/openscholar_projects.profile.patch ./
   patch -p1 < openscholar_projects.profile.patch &> /dev/null
   cd $_CORE/openscholar-$_OPENSCHOLAR/profiles/openscholar/modules/contrib/activity
-  cp -af /opt/tmp/nginx-for-drupal/aegir/patches/activity.patch ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/activity.patch ./
   patch -p1 < activity.patch &> /dev/null
   cd $_CORE/openscholar-$_OPENSCHOLAR/profiles/openscholar/modules/contrib/imagefield_crop
-  cp -af /opt/tmp/nginx-for-drupal/aegir/patches/imagefield_crop.patch ./
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/imagefield_crop.patch ./
   patch -p0 < imagefield_crop.patch &> /dev/null
   cd $_CORE/openscholar-$_OPENSCHOLAR
   create_dirs
@@ -908,7 +910,7 @@ else
   cd $_THIS_HOSTMASTER
 fi
 DRUSHC="$_ROOT/tools/drush/drush"
-cp -af /opt/tmp/nginx-for-drupal/aegir/helpers/make_platform.php.txt ./
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_platform.php.txt ./
 mv -f make_platform.php.txt make_platform.php &> /dev/null
 if [ -d "$_ROOT/distro/$_THIS_CORE/acquia" ] ; then
   if [ ! -e "$_ROOT/distro/$_THIS_CORE/acquia/drushrc.php" ] ; then

diff --git a/aegir/barracuda/AegirUpgrade.sh.txt b/aegir/barracuda/AegirUpgrade.sh.txt
index 68e990e..4e60000 100644 (file)
--- a/aegir/barracuda/AegirUpgrade.sh.txt
+++ b/aegir/barracuda/AegirUpgrade.sh.txt
@@ -13,7 +13,7 @@
 ###  responsibility for any disasters caused
 ###  during the execution of this script.
 ###
-###  Code: http://github.com/omega8cc
+###  Code: http://gitorious.org/aegir
 ###
 ###----------------------------------------###
 
@@ -23,6 +23,12 @@
 ###----------------------------------------###
 
 _INSTALLER_VERSION=EDIT_INSTALLER_VERSION
+_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
+_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
+_DOMAIN=EDIT_DOMAIN
+_AEGIR_VERSION=EDIT_AEGIR_VERSION
+_DRUSH_VERSION=EDIT_DRUSH_VERSION
+_DEBUG_MODE=EDIT_DEBUG_MODE
 
 
 ###---### Functions
@@ -64,7 +70,7 @@ hostmaster_go_up () {
     mkdir -p $_ROOT/.drush
     cd $_ROOT/.drush
     if [ "$_AEGIR_VERSION" = "HEAD" ]; then
-      git clone git://github.com/omega8cc/provision.git &> /dev/null
+      git clone $_BOA_REPO_GIT_URL/provision.git &> /dev/null
     else
       wget -q -U iCab http://files.aegirproject.org/provision-$_AEGIR_VERSION.tgz
       tar -xzf provision-$_AEGIR_VERSION.tgz
@@ -94,10 +100,6 @@ hostmaster_mi_up () {
 _NOW=`date +%y%m%d-%H%M`
 _LASTNUM=001
 _DISTRO=001
-_DOMAIN=EDIT_DOMAIN
-_AEGIR_VERSION=EDIT_AEGIR_VERSION
-_DRUSH_VERSION=EDIT_DRUSH_VERSION
-_DEBUG_MODE=EDIT_DEBUG_MODE
 _DRUSHCMD="php /var/aegir/drush/drush.php"
 _ROOT="/var/aegir"
 _AEGIR_DIRN=`ls -l $_ROOT | grep hostmaster | cut -d: -f2 | awk '{ print $2}'`

diff --git a/aegir/conf/lshell.conf.txt b/aegir/conf/lshell.conf.txt
index b63070e..ce6bb33 100644 (file)
--- a/aegir/conf/lshell.conf.txt
+++ b/aegir/conf/lshell.conf.txt
@@ -11,7 +11,7 @@ loglevel        : 4
 
 [default]
 ##  a list of the allowed commands or 'all' to allow all commands in user's PATH
-allowed         : ['drush','drush dbup','drush mup','drush make','drush help','drush dl','drush cc','drush en','drush dis','drush st','drush cron','drush dd','drush sm','drush sa','drush sql-conf','drush sqlq','drush sql connect','drush sqlc','drush sql-dump','drush uinf','drush ublk','drush uublk','drush urol','drush urrol','drush ucrt','drush ucan','drush upwd','drush vget','drush vset','drush vdel','drush fd','drush fe','drush fl','drush fr','drush fra','drush fu','drush fua','ls','echo','cd','ll','mysql','git','svn','cvs','rsync','less','nano','cp','wget','bzr','vi','cat','lftp','sed','grep','mkdir','tar','gzip','unzip','passwd','scp','rm','mv','pwd','chmod']
+allowed         : ['drush','drush dbup','drush mup','drush make','drush help','drush dl','drush cc','drush en','drush dis','drush st','drush cron','drush dd','drush sm','drush sa','drush sql-conf','drush sqlq','drush sql-connect','drush sqlc','drush sql-dump','drush uinf','drush ublk','drush uublk','drush urol','drush urrol','drush ucrt','drush ucan','drush upwd','drush vget','drush vset','drush vdel','drush fd','drush fe','drush fl','drush fr','drush fra','drush fu','drush fua','ls','echo','cd','ll','mysql','git','svn','cvs','rsync','less','nano','cp','wget','bzr','vi','cat','lftp','sed','grep','mkdir','tar','gzip','unzip','passwd','scp','rm','mv','pwd','chmod']
 
 ##  a list of forbidden character or commands
 forbidden       : [';', '&', '|','`', '$(', '${', 'drush up', 'drush pm-update', 'drush upc', 'drush pm-updatecode', 'drush si', 'drush site-install', 'drush sup', 'drush site-upgrade', 'drush cli', 'drush core-cli', 'drush core-rsync', 'drush rsync', 'drush php-eval', 'drush scr', 'drush php-script']

diff --git a/aegir/patches/nik.patch b/aegir/patches/nik.patch
index dff86e4..9cd60da 100644 (file)
--- a/aegir/patches/nik.patch
+++ b/aegir/patches/nik.patch
@@ -17,7 +17,7 @@
  # set -e ### disable this for debugging
 @@ -703,34 +711,40 @@ if [ ! -f "/var/aegir/config/includes/ap
      mrun "sleep 3"
-     cd /opt/tmp/nginx-for-drupal/aegir/helpers
+     cd /opt/tmp/$_BOA_REPO_NAME/aegir/helpers
      _MIRROR=`bash ffmirror.sh.txt < apt-list-ubuntu.txt`
 +              _MIRROR="http://$_MIRROR/ubuntu/"
 +              prompt_confirm_choice "Enter your own mirror to use or press enter to use the fastest found mirror " $_MIRROR
@@ -49,7 +49,7 @@
    elif [ "$_THIS_OS" = "Debian" ] ; then
      msg "`date` INFO: Now looking for the best/fastest $_THIS_OS mirror, it can take a while, please wait..."
      mrun "sleep 3"
-     cd /opt/tmp/nginx-for-drupal/aegir/helpers
+     cd /opt/tmp/$_BOA_REPO_NAME/aegir/helpers
      _MIRROR=`bash ffmirror.sh.txt < apt-list-debian.txt`
 +              _MIRROR="http://$_MIRROR/debian/"
 +              prompt_confirm_choice "Enter your own mirror to use or press enter to use the fastest found mirror " $_MIRROR

diff --git a/aegir/scripts/aegir-alpha-install.sh.txt b/aegir/scripts/aegir-alpha-install.sh.txt
index 8e5336f..e499ee3 100644 (file)
--- a/aegir/scripts/aegir-alpha-install.sh.txt
+++ b/aegir/scripts/aegir-alpha-install.sh.txt
@@ -28,7 +28,10 @@
 ########################################################################
 # basic variables, change before release
 AEGIR_VERSION="0.4-alpha15"
-DRUSH_VERSION=6.x-3.3
+
+_DRUSH_VERSION=EDIT_DRUSH_VERSION
+_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
+_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
 
 # when adding a variable here, add it to the display below
 
@@ -104,9 +107,9 @@ elif [ -x $DRUSH ] ; then
 else
   msg "Installing drush in $AEGIR_HOME"
   cd $AEGIR_HOME
-  wget -q -U iCab http://ftp.drupal.org/files/projects/drush-$DRUSH_VERSION.tar.gz
-  gunzip -q -c drush-$DRUSH_VERSION.tar.gz | tar -xf -
-  rm drush-$DRUSH_VERSION.tar.gz
+  wget -q -U iCab http://ftp.drupal.org/files/projects/drush-$_DRUSH_VERSION.tar.gz
+  gunzip -q -c drush-$_DRUSH_VERSION.tar.gz | tar -xf -
+  rm drush-$_DRUSH_VERSION.tar.gz
   DRUSH="php $AEGIR_HOME/drush/drush.php"
 fi
 
@@ -123,7 +126,7 @@ else
   msg "Installing provision backend in $AEGIR_HOME/.drush"
   mkdir -p $AEGIR_HOME/.drush
   if [ "$AEGIR_VERSION" = "HEAD" ]; then
-    git clone git://github.com/omega8cc/provision.git $AEGIR_HOME/.drush/provision
+    git clone $_BOA_REPO_GIT_URL/provision.git $AEGIR_HOME/.drush/provision
   else
     cd $AEGIR_HOME/.drush
     wget -q -U iCab http://files.aegirproject.org/provision-$AEGIR_VERSION.tgz

diff --git a/aegir/scripts/aegir-head-install.sh.txt b/aegir/scripts/aegir-head-install.sh.txt
index 8818262..4e4452c 100644 (file)
--- a/aegir/scripts/aegir-head-install.sh.txt
+++ b/aegir/scripts/aegir-head-install.sh.txt
@@ -29,6 +29,8 @@
 # basic variables, change before release
 AEGIR_VERSION="HEAD"
 DRUSH_VERSION=6.x-3.3
+_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
+_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
 
 # when adding a variable here, add it to the display below
 
@@ -123,7 +125,7 @@ else
   msg "Installing provision backend in $AEGIR_HOME/.drush"
   mkdir -p $AEGIR_HOME/.drush
   if [ "$AEGIR_VERSION" = "HEAD" ]; then
-    git clone git://github.com/omega8cc/provision.git $AEGIR_HOME/.drush/provision
+    git clone $_BOA_REPO_GIT_URL/provision.git $AEGIR_HOME/.drush/provision
   else
     cd $AEGIR_HOME/.drush
     wget -q -U iCab http://files.aegirproject.org/provision-$AEGIR_VERSION.tgz

diff --git a/aegir/scripts/aegir-test-install.sh.txt b/aegir/scripts/aegir-test-install.sh.txt
index 8818262..4e4452c 100644 (file)
--- a/aegir/scripts/aegir-test-install.sh.txt
+++ b/aegir/scripts/aegir-test-install.sh.txt
@@ -29,6 +29,8 @@
 # basic variables, change before release
 AEGIR_VERSION="HEAD"
 DRUSH_VERSION=6.x-3.3
+_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
+_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
 
 # when adding a variable here, add it to the display below
 
@@ -123,7 +125,7 @@ else
   msg "Installing provision backend in $AEGIR_HOME/.drush"
   mkdir -p $AEGIR_HOME/.drush
   if [ "$AEGIR_VERSION" = "HEAD" ]; then
-    git clone git://github.com/omega8cc/provision.git $AEGIR_HOME/.drush/provision
+    git clone $_BOA_REPO_GIT_URL/provision.git $AEGIR_HOME/.drush/provision
   else
     cd $AEGIR_HOME/.drush
     wget -q -U iCab http://files.aegirproject.org/provision-$AEGIR_VERSION.tgz

diff --git a/aegir/tools/auto-healing-monitoring/cron/crontabs/root b/aegir/tools/auto-healing-monitoring/cron/crontabs/root
index 44b4260..834feb1 100644 (file)
--- a/aegir/tools/auto-healing-monitoring/cron/crontabs/root
+++ b/aegir/tools/auto-healing-monitoring/cron/crontabs/root
@@ -3,6 +3,7 @@
 # (Cron version -- $Id: crontab.c,v 2.13 1994/01/17 03:20:37 vixie Exp $)
 * * * * * bash /var/xdrago/second >/dev/null 2>&1
 * * * * * bash /var/xdrago/Minute >/dev/null 2>&1
+*/2 * * * * bash /var/xdrago/runner.sh >/dev/null 2>&1
 30 * * * * bash /var/xdrago/FireStart >/dev/null 2>&1
 02 * * * * bash /var/xdrago/purge_binlogs.sh >/dev/null 2>&1
 */60 * * * * bash /var/xdrago/clear.sh >/dev/null 2>&1

diff --git a/aegir/tools/auto-healing-monitoring/runner.sh b/aegir/tools/auto-healing-monitoring/runner.sh
index 9de4e1f..37af364 100755 (executable)
--- a/aegir/tools/auto-healing-monitoring/runner.sh
+++ b/aegir/tools/auto-healing-monitoring/runner.sh
@@ -2,30 +2,31 @@
 
 ###-------------SYSTEM-----------------###
 
-SERVERS="run-a run-b"
-
-###-------------SYSTEM-----------------###
 action()
 {
-NOW_LOAD=`awk '{print $1*100}' /proc/loadavg`
-CTL_LOAD=200
-if [ $NOW_LOAD -lt $CTL_LOAD ]; then
-echo load is $NOW_LOAD while maxload is $CTL_LOAD
-echo ... now doing CTL...
-for i in $SERVERS; do
-sh /var/xdrago/$i
-sleep 5
+for Runner in `find /var/xdrago -maxdepth 1 -type f | grep run- | uniq | sort`
+do
+  NOW_LOAD=`awk '{print $1*100}' /proc/loadavg`
+  CTL_LOAD=200
+  if [ $NOW_LOAD -lt $CTL_LOAD ]; then
+    echo load is $NOW_LOAD while maxload is $CTL_LOAD
+    echo running $Runner
+    bash $Runner
+    echo waiting 8 sec
+    sleep 8
+    echo CTL done
+  else
+    echo load is $NOW_LOAD while maxload is $CTL_LOAD
+    echo ...we have to wait...
+  fi
 done
-echo CTL done
-else
-echo load is $NOW_LOAD while maxload is $CTL_LOAD
-echo ...we have to wait...
-fi
 }
 
+###-------------SYSTEM-----------------###
+
 if test -f /var/xdrago/log/optimize_mysql_ao.pid ; then
-touch /var/xdrago/log/wait-runner
-exit
+  touch /var/xdrago/log/wait-runner
+  exit
 else
-action
+  action
 fi

diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index e026537..0838b89 100644 (file)
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -19,7 +19,7 @@
                                 
 ### Installing Barracuda (main system and core Aegir instance):
 #
-$ cd; wget --no-check-certificate https://github.com/omega8cc/nginx-for-drupal/raw/master/BARRACUDA.sh.txt
+$ cd; wget http://gitorious.org/aegir/barracuda-octopus/blobs/raw/master/BARRACUDA.sh.txt
 $ cd; nano BARRACUDA.sh.txt (edit your e-mail address)
 $ cd; bash BARRACUDA.sh.txt
 
@@ -27,7 +27,7 @@ $ cd; bash BARRACUDA.sh.txt
 ### Optional: If in addition you want an instance of Aegir preloaded with platforms
 #             you will need to run OCTOPUS.sh.txt after running BARRACUDA.sh.txt
 #
-$ cd; wget --no-check-certificate https://github.com/omega8cc/nginx-for-drupal/raw/master/OCTOPUS.sh.txt
+$ cd; wget http://gitorious.org/aegir/barracuda-octopus/blobs/raw/master/OCTOPUS.sh.txt
 $ cd; nano OCTOPUS.sh.txt (edit your e-mail address, username and domain name)
 $ cd; bash OCTOPUS.sh.txt
 

diff --git a/docs/UPGRADE.txt b/docs/UPGRADE.txt
index 37b66f0..559e4af 100644 (file)
--- a/docs/UPGRADE.txt
+++ b/docs/UPGRADE.txt
@@ -1,14 +1,14 @@
 
 ### To upgrade OS/libraries/services and/or optionally core Aegir instance:
 #
-$ cd; wget http://github.com/omega8cc/nginx-for-drupal/raw/master/BARRACUDA.sh.txt
+$ cd; wget http://gitorious.org/aegir/barracuda-octopus/blobs/raw/master/BARRACUDA.sh.txt
 $ cd; nano BARRACUDA.sh.txt (edit your e-mail address)
 $ cd; bash BARRACUDA.sh.txt (say Y/n on prompt for upgrade of hostmaster)
 
 
 ### To upgrade any Aegir non-core instance and/or platforms selectively:
 #
-$ cd; wget http://github.com/omega8cc/nginx-for-drupal/raw/master/OCTOPUS.sh.txt
+$ cd; wget http://gitorious.org/aegir/barracuda-octopus/blobs/raw/master/OCTOPUS.sh.txt
 $ cd; nano OCTOPUS.sh.txt (edit your e-mail address, username and domain name of upgraded instance)
 $ cd; bash OCTOPUS.sh.txt (say Y/n on prompts for upgrade of hostmaster and/or platforms)