Commit 01238695 authored by vogelor's avatar vogelor

Fixed some autoupdate-problems

parent 039b461d
...@@ -179,17 +179,16 @@ class remoteaction_core_module { ...@@ -179,17 +179,16 @@ class remoteaction_core_module {
exec("tar xvfz ISPConfig-" . $new_version . ".tar.gz"); exec("tar xvfz ISPConfig-" . $new_version . ".tar.gz");
/* /*
* Start the automated update * Initialize the automated update
* (the update is then done next start of server.sh
*/ */
chdir("/tmp/ispconfig3_install/install"); chdir("/tmp/ispconfig3_install/install");
exec("touch autoupdate"); exec("touch autoupdate");
exec("php -q autoupdate.php");
/* /*
* do some clean-up * do some clean-up
*/ */
exec("rm /tmp/ISPConfig-" . $new_version . ".tar.gz"); exec("rm /tmp/ISPConfig-" . $new_version . ".tar.gz");
exec("rm /tmp/ispconfig3_install -R");
/* /*
* go back to the "old path" * go back to the "old path"
......
...@@ -4,4 +4,22 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin ...@@ -4,4 +4,22 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
. /etc/profile . /etc/profile
/usr/bin/php -q /usr/local/ispconfig/server/server.php if [ -f /tmp/ispconfig3_install/install/autoupdate ]; then
#
# there is a auto-update waiting for update, so let's do it
#
cd /tmp/ispconfig3_install/install
/usr/bin/php -q autoupdate.php
cd /
#
# do some clean-up
#
rm /tmp/ispconfig3_install -R
else
#
# there is no update waiting, so lets start the ISPConfig-System
#
/usr/bin/php -q /usr/local/ispconfig/server/server.php
fi
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment