BOA: Spring cleaning part I (Robert)

BARRACUDA.sh.txt

@@ -1457,9 +1457,9 @@ if [ -d "/var/xdrago" ] ; then
   mkdir -p /var/backups/dragon/x
   mkdir -p /var/backups/dragon/z
   mv -f /var/xdrago-pre* /var/backups/dragon/x/ &> /dev/null
-  mv -f /var/xdrago/log/init.d-pre* /var/backups/dragon/z/ &> /dev/null
+  rm -f -r /var/xdrago/log/init.d-pre*
+  rm -f -r /var/backups/dragon/z/init.d-pre-*
   cp -af /var/xdrago /var/backups/dragon/x/xdrago-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
-  cp -af /opt/etc/init.d /var/backups/dragon/z/init.d-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
   cp -af /var/spool/cron/crontabs/root /var/backups/dragon/z/cron-root-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
   cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/tools/auto-healing-monitoring/* /var/xdrago/ &> /dev/null
   if [ -z "$_THISHTIP" ] ; then
@@ -1478,8 +1478,9 @@ fi
 if [ $_STATUS = "INIT" ] ; then
   mkdir -p ./xdrago
   cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/tools/auto-healing-monitoring/* ./xdrago/ &> /dev/null
-  cp -af /var/xdrago/etc /opt/ &> /dev/null
-  cp -af /opt/etc/init.d/* /etc/init.d/ &> /dev/null
+  mkdir -p /opt/etc
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/php.ini /opt/etc/php.ini &> /dev/null
+  cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/php-fpm.conf /opt/etc/php-fpm.conf &> /dev/null
   cp -af /var/xdrago/cron/crontabs/root /var/spool/cron/crontabs/ &> /dev/null
   chown root:crontab /var/spool/cron/crontabs/root
   chmod 600 /var/spool/cron/crontabs/root
@@ -1587,7 +1588,6 @@ if [ $_PHP_INSTALL_REQUIRED = "YES" ] ; then
   mrun "sleep 3"
   cd /var/opt
   rm -f -r /var/opt/php*
-  mv -f /etc/init.d/php-fpm /var/backups/php-fpm-pre-$_INSTALLER_VERSION-$_NOW &> /dev/null
   rm -f /etc/init.d/php-fpm*
   wget -q -U iCab http://www.php.net/distributions/php-$_PHP_VERSION.tar.gz
   wget -q -U iCab http://download.suhosin.org/suhosin-patch-5.2.16-0.9.7.patch.gz
@@ -1608,14 +1608,11 @@ if [ $_PHP_INSTALL_REQUIRED = "YES" ] ; then
   mrun "sleep 3"
   st_runner "make --quiet" 2> /dev/null
   st_runner "make --quiet install" 2> /dev/null
-  ln -s /usr/local/sbin/php-fpm /etc/init.d/php-fpm
-  sed -i "s/php_fpm_CONF\"/php_fpm_CONF -c \/opt\/etc\/php.ini\"/g" /usr/local/sbin/php-fpm
-  sed -i "s/\/usr\/local\/etc\/php-fpm.conf/\/opt\/etc\/php-fpm.conf/g" /usr/local/sbin/php-fpm
-  sed -i "s/\/usr\/local\/logs\/php-fpm.pid/\/var\/run\/php-fpm.pid/g" /usr/local/sbin/php-fpm
   echo "libcurl4-openssl-dev" > /var/log/libcurl4-openssl-dev.log
   cd /usr/local/sbin
   cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/php-fpm ./
   chmod 755 php-fpm
+  ln -s /usr/local/sbin/php-fpm /etc/init.d/php-fpm
 
 
 ###--------------------###

TODO.txt

@@ -8,6 +8,8 @@
 
 ### In progress
 
+* Automated FTP/SSH accounts per site and per platform.
+* Embedded Aegir Knowledge Base and How-To Recipes.
 * Clone Nginx integration for Cherokee web server.
 
 

aegir/barracuda/AegirSetupB.sh.txt

@@ -398,8 +398,8 @@ fi
 msg "$_STATUS B: Enhance Aegir UI"
 mrun "sleep 3"
 cd $_AEGIR_ROOT/profiles/hostmaster/themes/eldir
-cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/eldir.diff ./
-patch -p1 <./eldir.diff &> /dev/null
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/eldir.patch ./
+patch -p1 <./eldir.patch &> /dev/null
 mkdir -p $_AEGIR_ROOT/sites/all/modules
 cd $_AEGIR_ROOT/sites/all/modules
 wget -q -U iCab http://files.aegir.cc/dev/aegir_custom_settings-6.x-1.6.tar.gz

aegir/conf/redis-server

@@ -7,8 +7,8 @@
 # Should-Stop:		$local_fs
 # Default-Start:	2 3 4 5
 # Default-Stop:		0 1 6
-# Short-Description:	redis-server - Persistent key-value db
-# Description:		redis-server - Persistent key-value db
+# Short-Description:    redis-server - Persistent key-value db
+# Description:          redis-server - Persistent key-value db
 ### END INIT INFO