Skip to content

Commit

Permalink
Stable BOA-2.4.3 Release - Full Edition
Browse files Browse the repository at this point in the history
  • Loading branch information
omega8cc committed May 19, 2015
1 parent 32e2172 commit 3a587bc
Show file tree
Hide file tree
Showing 22 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion BOA.sh.txt
Expand Up @@ -46,7 +46,7 @@ SHELL=/bin/bash
export DEBIAN_FRONTEND=noninteractive

_TODAY=$(date +%y%m%d 2>&1)
_X_VERSION="BOA-2.4.2-stable"
_X_VERSION="BOA-2.4.3-stable"
#
saCoreN="SA-CORE-2014-005"
saCoreS="${saCoreN}-D7"
Expand Down
2 changes: 1 addition & 1 deletion aegir/conf/barracuda-version.txt
@@ -1 +1 @@
BOA-2.4.2
BOA-2.4.3
2 changes: 1 addition & 1 deletion aegir/conf/boa.bashrc.txt
@@ -1,5 +1,5 @@
#-------------------------------------------------------------
# BOA-2.4.2 default .bashrc
# BOA-2.4.3 default .bashrc
#-------------------------------------------------------------

ulimit -S -c 0
Expand Down
2 changes: 1 addition & 1 deletion aegir/conf/default.boa_platform_control.ini
Expand Up @@ -11,7 +11,7 @@
;; Note that it takes ~60 seconds to see any modification results in action
;; due to opcode caching enabled in PHP-FPM for all non-dev sites.
;;
;; BOA-2.4.2
;; BOA-2.4.3
;;


Expand Down
2 changes: 1 addition & 1 deletion aegir/conf/default.boa_site_control.ini
Expand Up @@ -11,7 +11,7 @@
;; Note that it takes ~60 seconds to see any modification results in action
;; due to opcode caching enabled in PHP-FPM for all non-dev sites.
;;
;; BOA-2.4.2
;; BOA-2.4.3
;;


Expand Down
2 changes: 1 addition & 1 deletion aegir/conf/octopus-version.txt
@@ -1 +1 @@
BOA-2.4.2
BOA-2.4.3
2 changes: 1 addition & 1 deletion aegir/conf/setupmail.txt
Expand Up @@ -3,7 +3,7 @@ Hello,
Welcome to your new Aegir control panel for easy Drupal
multi-sites deployment, development and management.

Your Aegir control panel [version BOA-2.4.2] is available at:
Your Aegir control panel [version BOA-2.4.3] is available at:

https://aegir.url.name

Expand Down
2 changes: 1 addition & 1 deletion aegir/conf/upgrademail.txt
@@ -1,6 +1,6 @@
Hello,

Your Aegir Hosting System has been upgraded to version BOA-2.4.2
Your Aegir Hosting System has been upgraded to version BOA-2.4.3

https://aegir.url.name

Expand Down
2 changes: 1 addition & 1 deletion aegir/conf/version.txt
@@ -1 +1 @@
BOA-2.4.2
BOA-2.4.3
6 changes: 3 additions & 3 deletions aegir/tools/BOND.sh.txt
Expand Up @@ -136,11 +136,11 @@ _TUNE_PHP_CLI_TIMEOUT=7200
### DON'T EDIT ANYTHING BELOW THIS LINE ###
###----------------------------------------###

_AEGIR_VERSION="HEAD"
_AEGIR_XTS_VRN="HEAD"
_AEGIR_VERSION="BOA-2.4.3"
_AEGIR_XTS_VRN="BOA-2.4.3"
_BRANCH_BOA="2.4.x-dev"
_BRANCH_PRN="2.4.x-dev"
_X_VERSION="BOA-2.4.3-dev"
_X_VERSION="BOA-2.4.3"

_NOW=$(date +%y%m%d-%H%M 2>&1)
_RAM=$(free -mto | grep Mem: | awk '{ print $2 }' 2>&1)
Expand Down
4 changes: 2 additions & 2 deletions aegir/tools/bin/barracuda
Expand Up @@ -4,11 +4,11 @@ PATH=/usr/local/bin:/usr/local/sbin:/opt/local/bin:/usr/bin:/usr/sbin:/bin:/sbin
SHELL=/bin/bash

branch="2.4.x-dev"
cluster="BOA-2.4.2"
cluster="BOA-2.4.3"
devel="2.4.x-dev"
legacy="BOA-2.2.9"
master="master"
stable="BOA-2.4.2"
stable="BOA-2.4.3"

barCnf="/root/.barracuda.cnf"
barName="BARRACUDA.sh.txt"
Expand Down
8 changes: 4 additions & 4 deletions aegir/tools/bin/boa
Expand Up @@ -4,11 +4,11 @@ PATH=/usr/local/bin:/usr/local/sbin:/opt/local/bin:/usr/bin:/usr/sbin:/bin:/sbin
SHELL=/bin/bash

branch="2.4.x-dev"
cluster="BOA-2.4.2"
cluster="BOA-2.4.3"
devel="2.4.x-dev"
legacy="BOA-2.2.9"
master="master"
stable="BOA-2.4.2"
stable="BOA-2.4.3"

barCnf="/root/.barracuda.cnf"
barName="BARRACUDA.sh.txt"
Expand Down Expand Up @@ -602,7 +602,7 @@ init_setup() {

if [ ! -z "${rkey}" ]; then
if [ "${rkey}" = "2.4" ]; then
vn="BOA-2.4.2"
vn="BOA-2.4.3"
branch="2.4.x-dev"
elif [ "${rkey}" = "2.3" ]; then
vn="BOA-2.3.8"
Expand All @@ -620,7 +620,7 @@ init_setup() {
if [ ! -z "${vn}" ]; then
curl ${crlGet} "${rgUrl}/${vn}/${barName}" -o ${vBs}/${barName}
curl ${crlGet} "${rgUrl}/${vn}/${octName}" -o ${vBs}/${octName}
if [ "${vn}" = "BOA-2.4.2" ]; then
if [ "${vn}" = "BOA-2.4.3" ]; then
curl ${crlGet} "${rgUrl}/${stable}/${pthIncB}" -o ${vBs}/${filIncB}
curl ${crlGet} "${rgUrl}/${stable}/${pthIncO}" -o ${vBs}/${filIncO}
fi
Expand Down
4 changes: 2 additions & 2 deletions aegir/tools/bin/octopus
Expand Up @@ -4,11 +4,11 @@ PATH=/usr/local/bin:/usr/local/sbin:/opt/local/bin:/usr/bin:/usr/sbin:/bin:/sbin
SHELL=/bin/bash

branch="2.4.x-dev"
cluster="BOA-2.4.2"
cluster="BOA-2.4.3"
devel="2.4.x-dev"
legacy="BOA-2.2.9"
master="master"
stable="BOA-2.4.2"
stable="BOA-2.4.3"

barCnf="/root/.barracuda.cnf"
barName="BARRACUDA.sh.txt"
Expand Down
2 changes: 1 addition & 1 deletion aegir/tools/system/conf/lshell.conf
@@ -1,5 +1,5 @@
# lshell.py configuration file
# BOA-2.4.2
# BOA-2.4.3
# $Id: lshell.conf,v 1.27 2010-10-18 19:05:17 ghantoos Exp $

[global]
Expand Down
2 changes: 1 addition & 1 deletion aegir/tools/system/daily.sh
Expand Up @@ -4,7 +4,7 @@ SHELL=/bin/bash
PATH=/usr/local/bin:/usr/local/sbin:/opt/local/bin:/usr/bin:/usr/sbin:/bin:/sbin
_WEBG=www-data
_OPENSSL_VRN=1.0.2a
_X_SE="2.4.2-stable"
_X_SE="2.4.3-stable"
_OSV=$(lsb_release -sc 2>&1)
_SSL_ITD=$(openssl version 2>&1 \
| tr -d "\n" \
Expand Down
22 changes: 11 additions & 11 deletions aegir/tools/system/manage_ltd_users.sh
Expand Up @@ -118,7 +118,7 @@ enable_chattr() {
_U_HD="/home/$1/.drush"
_U_TP="/home/$1/.tmp"
_U_II="${_U_HD}/php.ini"
if [ ! -e "${_U_HD}/.ctrl.242stableU.txt" ]; then
if [ ! -e "${_U_HD}/.ctrl.243stableU.txt" ]; then
if [[ "${_CHECK_HOST}" =~ ".host8." ]] \
|| [[ "${_CHECK_HOST}" =~ ".boa.io" ]] \
|| [ "${_VMFAMILY}" = "VS" ]; then
Expand Down Expand Up @@ -179,7 +179,7 @@ enable_chattr() {

if [ "${_PHP_CLI_UPDATE}" = "YES" ] \
|| [ ! -e "${_U_II}" ] \
|| [ ! -e "${_U_HD}/.ctrl.242stableU.txt" ]; then
|| [ ! -e "${_U_HD}/.ctrl.243stableU.txt" ]; then
mkdir -p ${_U_HD}
rm -f ${_U_HD}/.ctrl.php*
rm -f ${_U_II}
Expand Down Expand Up @@ -246,7 +246,7 @@ enable_chattr() {
sed -i "s/.*sys_temp_dir =.*/sys_temp_dir = ${_QTP}/g" ${_U_II}
sed -i "s/.*upload_tmp_dir =.*/upload_tmp_dir = ${_QTP}/g" ${_U_II}
echo > ${_U_HD}/.ctrl.php${_U_INI}.txt
echo > ${_U_HD}/.ctrl.242stableU.txt
echo > ${_U_HD}/.ctrl.243stableU.txt
fi
fi

Expand Down Expand Up @@ -671,7 +671,7 @@ update_php_cli_local_ini() {
if [ "${_PHP_CLI_UPDATE}" = "YES" ] \
|| [ ! -e "${_U_II}" ] \
|| [ ! -d "${_U_TP}" ] \
|| [ ! -e "${_U_HD}/.ctrl.242stableU.txt" ]; then
|| [ ! -e "${_U_HD}/.ctrl.243stableU.txt" ]; then
mkdir -p ${_U_TP}
touch ${_U_TP}
find ${_U_TP}/ -mtime +0 -exec rm -rf {} \; &> /dev/null
Expand Down Expand Up @@ -724,7 +724,7 @@ update_php_cli_local_ini() {
sed -i "s/.*sys_temp_dir =.*/sys_temp_dir = ${_QTP}/g" ${_U_II}
sed -i "s/.*upload_tmp_dir =.*/upload_tmp_dir = ${_QTP}/g" ${_U_II}
echo > ${_U_HD}/.ctrl.php${_U_INI}.txt
echo > ${_U_HD}/.ctrl.242stableU.txt
echo > ${_U_HD}/.ctrl.243stableU.txt
fi
chattr +i ${_U_II}
fi
Expand Down Expand Up @@ -1432,16 +1432,16 @@ for pthParentUsr in `find /data/disk/ -maxdepth 1 -mindepth 1 | sort`; do
-type d -exec chmod 0700 {} \; &> /dev/null
find ${dscUsr}/config/server_master \
-type f -exec chmod 0600 {} \; &> /dev/null
if [ ! -e "${dscUsr}/.tmp/.ctrl.242stableU.txt" ]; then
if [ ! -e "${dscUsr}/.tmp/.ctrl.243stableU.txt" ]; then
rm -f -r ${dscUsr}/.drush/cache
mkdir -p ${dscUsr}/.tmp
touch ${dscUsr}/.tmp
find ${dscUsr}/.tmp/ -mtime +0 -exec rm -rf {} \; &> /dev/null
chown ${_USER}:${usrGroup} ${dscUsr}/.tmp &> /dev/null
chmod 02755 ${dscUsr}/.tmp &> /dev/null
echo OK > ${dscUsr}/.tmp/.ctrl.242stableU.txt
echo OK > ${dscUsr}/.tmp/.ctrl.243stableU.txt
fi
if [ ! -e "${dscUsr}/static/control/.ctrl.242stableU.txt" ]; then
if [ ! -e "${dscUsr}/static/control/.ctrl.243stableU.txt" ]; then
mkdir -p ${dscUsr}/static/control
chmod 755 ${dscUsr}/static/control
if [ -e "/var/xdrago/conf/control-readme.txt" ]; then
Expand All @@ -1452,7 +1452,7 @@ for pthParentUsr in `find /data/disk/ -maxdepth 1 -mindepth 1 | sort`; do
chown -R ${_USER}.ftp:${usrGroup} \
${dscUsr}/static/control &> /dev/null
rm -f ${dscUsr}/static/control/.ctrl.*
echo OK > ${dscUsr}/static/control/.ctrl.242stableU.txt
echo OK > ${dscUsr}/static/control/.ctrl.243stableU.txt
fi
if [ -e "/root/.${_USER}.octopus.cnf" ]; then
source /root/.${_USER}.octopus.cnf
Expand Down Expand Up @@ -1489,13 +1489,13 @@ for pthParentUsr in `find /data/disk/ -maxdepth 1 -mindepth 1 | sort`; do
ln -sf ${dscUsr}/clients /home/${_USER}.ftp/clients
ln -sf ${dscUsr}/static /home/${_USER}.ftp/static
fi
if [ ! -e "/home/${_USER}.ftp/.tmp/.ctrl.242stableU.txt" ]; then
if [ ! -e "/home/${_USER}.ftp/.tmp/.ctrl.243stableU.txt" ]; then
rm -f -r /home/${_USER}.ftp/.drush/cache
rm -f -r /home/${_USER}.ftp/.tmp
mkdir -p /home/${_USER}.ftp/.tmp
chown ${_USER}.ftp:${usrGroup} /home/${_USER}.ftp/.tmp &> /dev/null
chmod 700 /home/${_USER}.ftp/.tmp &> /dev/null
echo OK > /home/${_USER}.ftp/.tmp/.ctrl.242stableU.txt
echo OK > /home/${_USER}.ftp/.tmp/.ctrl.243stableU.txt
fi
enable_chattr ${_USER}.ftp
echo Done for ${pthParentUsr}
Expand Down
4 changes: 2 additions & 2 deletions docs/cnf/barracuda.cnf
@@ -1,5 +1,5 @@
###
### Barracuda version BOA-2.4.2
### Barracuda version BOA-2.4.3
###
### Configuration stored in the /root/.barracuda.cnf file.
### This example is for public install mode - see docs/INSTALL.txt
Expand Down Expand Up @@ -84,7 +84,7 @@ _CUSTOM_CONFIG_SQL=NO #--------- Protects custom SQL config when YES
_AEGIR_UPGRADE_ONLY=NO #-------- Run only Aegir upgrade when YES (deprecated)
_SYSTEM_UPGRADE_ONLY=NO #------- Managed on the fly with 'system' keyword
###
### Barracuda version BOA-2.4.2
### Barracuda version BOA-2.4.3
###

###
Expand Down
4 changes: 2 additions & 2 deletions docs/cnf/octopus.cnf
@@ -1,5 +1,5 @@
###
### Octopus version BOA-2.4.2
### Octopus version BOA-2.4.3
###
### Configuration stored in the /root/.${_USER}.octopus.cnf file.
### This example is for public install mode - see docs/INSTALL.txt
Expand Down Expand Up @@ -42,7 +42,7 @@ _CLIENT_OPTION="SSD" #---------- Currently not used
_CLIENT_SUBSCR="Y" #------------ Currently not used
_CLIENT_CORES="8" #------------- Currently not used
###
### Octopus version BOA-2.4.2
### Octopus version BOA-2.4.3
###

###
Expand Down
4 changes: 2 additions & 2 deletions lib/functions/master.sh.inc
Expand Up @@ -789,7 +789,7 @@ update_php_cli_local_ini() {
if [ "$_PHP_CLI_UPDATE" = "YES" ] \
|| [ ! -e "${_U_II}" ] \
|| [ ! -d "${_U_TP}" ] \
|| [ ! -e "${_U_HD}/.ctrl.242stableU.txt" ]; then
|| [ ! -e "${_U_HD}/.ctrl.243stableU.txt" ]; then
mkdir -p ${_U_TP}
touch ${_U_TP}
find ${_U_TP}/ -mtime +0 -exec rm -rf {} \; &> /dev/null
Expand Down Expand Up @@ -838,7 +838,7 @@ update_php_cli_local_ini() {
sed -i "s/.*sys_temp_dir =.*/sys_temp_dir = ${_QTP}/g" ${_U_II}
sed -i "s/.*upload_tmp_dir =.*/upload_tmp_dir = ${_QTP}/g" ${_U_II}
echo > ${_U_HD}/.ctrl.php${_U_INI}.txt
echo > ${_U_HD}/.ctrl.242stableU.txt
echo > ${_U_HD}/.ctrl.243stableU.txt
fi
fi
}
Expand Down
8 changes: 4 additions & 4 deletions lib/functions/satellite.sh.inc
Expand Up @@ -1006,7 +1006,7 @@ satellite_child_b_update_ini_php_cli() {
if [ "$_PHP_CLI_UPDATE" = "YES" ] \
|| [ ! -e "${_U_II}" ] \
|| [ ! -d "${_U_TP}" ] \
|| [ ! -e "${_U_HD}/.ctrl.242stableU.txt" ]; then
|| [ ! -e "${_U_HD}/.ctrl.243stableU.txt" ]; then
mkdir -p ${_U_TP}
touch ${_U_TP}
find ${_U_TP}/ -mtime +0 -exec rm -rf {} \; &> /dev/null
Expand Down Expand Up @@ -1054,7 +1054,7 @@ satellite_child_b_update_ini_php_cli() {
sed -i "s/.*sys_temp_dir =.*/sys_temp_dir = ${_QTP}/g" ${_U_II}
sed -i "s/.*upload_tmp_dir =.*/upload_tmp_dir = ${_QTP}/g" ${_U_II}
echo > ${_U_HD}/.ctrl.php${_U_INI}.txt
echo > ${_U_HD}/.ctrl.242stableU.txt
echo > ${_U_HD}/.ctrl.243stableU.txt
fi
fi
}
Expand Down Expand Up @@ -3148,7 +3148,7 @@ satellite_make() {
echo ${_PHP_CLI_VERSION} > ${_ROOT}/log/cli.txt
fi

if [ ! -e "${_ROOT}/static/control/.ctrl.242stableU.txt" ] \
if [ ! -e "${_ROOT}/static/control/.ctrl.243stableU.txt" ] \
|| [ ! -e "${_ROOT}/static/control/README.txt" ]; then
mkdir -p ${_ROOT}/static/control
chmod 755 ${_ROOT}/static/control
Expand All @@ -3160,7 +3160,7 @@ satellite_make() {
chown -R ${_USER}.ftp:${_USRG} \
${_ROOT}/static/control &> /dev/null
rm -f ${_ROOT}/static/control/.ctrl.*
echo OK > ${_ROOT}/static/control/.ctrl.242stableU.txt
echo OK > ${_ROOT}/static/control/.ctrl.243stableU.txt
fi

if [ -d "/data/all/000" ]; then
Expand Down
6 changes: 3 additions & 3 deletions lib/settings/barracuda.sh.cnf
Expand Up @@ -1024,11 +1024,11 @@ _SPEED_VALID_MAX=3600
###----------------------------------------###


_AEGIR_VERSION="HEAD"
_AEGIR_XTS_VRN="HEAD"
_AEGIR_VERSION="BOA-2.4.3"
_AEGIR_XTS_VRN="BOA-2.4.3"
_BRANCH_BOA="2.4.x-dev"
_BRANCH_PRN="2.4.x-dev"
_X_VERSION="BOA-2.4.3-dev"
_X_VERSION="BOA-2.4.3"
_BOA_REPO_NAME="boa"
_BOA_REPO_GIT_URL="${gitHub}"

Expand Down
6 changes: 3 additions & 3 deletions lib/settings/octopus.sh.cnf
Expand Up @@ -586,11 +586,11 @@ _RESERVED_RAM=0
###----------------------------------------###


_AEGIR_VERSION="HEAD"
_AEGIR_XTS_VRN="HEAD"
_AEGIR_VERSION="BOA-2.4.3"
_AEGIR_XTS_VRN="BOA-2.4.3"
_BRANCH_BOA="2.4.x-dev"
_BRANCH_PRN="2.4.x-dev"
_X_VERSION="BOA-2.4.3-dev"
_X_VERSION="BOA-2.4.3"
_BOA_REPO_NAME="boa"
_BOA_REPO_GIT_URL="${gitHub}"

Expand Down

0 comments on commit 3a587bc

Please sign in to comment.