Merge branch 'master' into 'master'

Till Brehm

2016-01-02 c6611ee0fc88487541f1aa90528a0b9cdcb6a703

Merge branch 'master' into 'master'

use mktemp in update scripts to avoid race conditions



See merge request !254

 interface/lib/classes/validate_dkim.inc.php

@@ -29,7 +29,7 @@
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 @author Florian Schaal, info@schaal-24.de
 @copyrighth Florian Schaal, info@schaal-24.de
 @copyright Florian Schaal, info@schaal-24.de
 */



 interface/lib/classes/validate_openvz.inc.php

@@ -28,7 +28,7 @@
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 @author Florian Schaal, info@schaal-24.de
 @copyrighth Florian Schaal, info@schaal-24.de
 @copyright Florian Schaal, info@schaal-24.de
 */

class validate_openvz {

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -29,7 +29,7 @@
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 @author Florian Schaal, info@schaal-24.de
 @copyrighth Florian Schaal, info@schaal-24.de
 @copyright Florian Schaal, info@schaal-24.de
 */



 server/scripts/update_from_dev.sh

old mode 100644
new mode 100755
@@ -1,17 +1,29 @@
#!/bin/bash

cd /tmp
rm -f ispconfig3-dev.tar.gz
{
    umask 0077 \
    && tmpdir=`mktemp -dt "$(basename $0).XXXXXXXXXX"` \
    && test -d "${tmpdir}" \
    && cd "${tmpdir}"
} || {
    echo 'mktemp failed'
    exit 1
}

wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
rm -rf ispconfig3-master*
tar xzf ispconfig3-dev.tar.gz

echo -n "Latest git version:  "
ls -1d ispconfig3-master*
cd ispconfig3-master*/install

php -q \
    -d disable_classes= \
    -d disable_functions= \
    -d open_basedir= \
    update.php

cd /tmp
rm -rf /tmp/ispconfig3-master* /tmp/ispconfig3-dev.tar.gz
rm -rf "${tmpdir}"

exit 0

 server/scripts/update_from_tgz.sh

@@ -1,11 +1,14 @@
#!/bin/bash

cd /tmp

if [ -f ISPConfig-3-stable.tar.gz ]
then
rm -f ISPConfig-3-stable.tar.gz
fi
{
    umask 0077 \
    && tmpdir=`mktemp -dt "$(basename $0).XXXXXXXXXX"` \
    && test -d "${tmpdir}" \
    && cd "${tmpdir}"
} || {
    echo 'mktemp failed'
    exit 1
}

wget http://www.ispconfig.org/downloads/ISPConfig-3-stable.tar.gz
if [ -f ISPConfig-3-stable.tar.gz ]
@@ -17,10 +20,11 @@
    -d disable_functions= \
    -d open_basedir= \
    update.php
    rm -rf /tmp/ispconfig3_install/install
    rm -f ISPConfig-3-stable.tar.gz
    cd /tmp
    rm -rf "${tmpdir}"
else
    echo "Unable to download the update."
    exit 1
fi

exit 0