Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dirk Dankhoff
ISPConfig 3
Commits
a2b61978
Commit
a2b61978
authored
Nov 25, 2011
by
tbrehm
Browse files
Removed ISPConfig update function from interface. Use ispconfig_update.sh on the shell instead.
parent
b6d93d28
Changes
5
Hide whitespace changes
Inline
Side-by-side
install/autoupdate.php
View file @
a2b61978
...
@@ -31,6 +31,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
...
@@ -31,6 +31,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ISPConfig 3 updater.
ISPConfig 3 updater.
*/
*/
die
(
"Autoupdate has been removed.
\n
Please start the update on the shell with the command ispconfig_update.sh as root user.
\n
"
);
error_reporting
(
E_ALL
|
E_STRICT
);
error_reporting
(
E_ALL
|
E_STRICT
);
/*
/*
...
...
interface/web/admin/lib/module.conf.php
View file @
a2b61978
...
@@ -193,11 +193,13 @@ $items[] = array( 'title' => 'Do OS-Update',
...
@@ -193,11 +193,13 @@ $items[] = array( 'title' => 'Do OS-Update',
'target'
=>
'content'
,
'target'
=>
'content'
,
'link'
=>
'admin/remote_action_osupdate.php'
,
'link'
=>
'admin/remote_action_osupdate.php'
,
'html_id'
=>
'osupdate'
);
'html_id'
=>
'osupdate'
);
/*
// ISPConfig interface update has been removed. Please use ispconfig_update.sh on the shell instead.
$items[] = array( 'title' => 'Do ISPConfig-Update',
$items[] = array( 'title' => 'Do ISPConfig-Update',
'target' => 'content',
'target' => 'content',
'link' => 'admin/remote_action_ispcupdate.php',
'link' => 'admin/remote_action_ispcupdate.php',
'html_id'=> 'ispcupdate');
'html_id'=> 'ispcupdate');
*/
$module
[
'nav'
][]
=
array
(
'title'
=>
'Remote Actions'
,
$module
[
'nav'
][]
=
array
(
'title'
=>
'Remote Actions'
,
'open'
=>
1
,
'open'
=>
1
,
...
...
interface/web/admin/remote_action_ispcupdate.php
View file @
a2b61978
...
@@ -27,6 +27,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
...
@@ -27,6 +27,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
*/
die
(
'Function has been removed.'
);
require_once
(
'../../lib/config.inc.php'
);
require_once
(
'../../lib/config.inc.php'
);
require_once
(
'../../lib/app.inc.php'
);
require_once
(
'../../lib/app.inc.php'
);
...
...
server/mods-available/remoteaction_core_module.inc.php
View file @
a2b61978
...
@@ -119,12 +119,14 @@ class remoteaction_core_module {
...
@@ -119,12 +119,14 @@ class remoteaction_core_module {
* we stop executing the actions not to waste more time */
* we stop executing the actions not to waste more time */
return
;
return
;
}
}
if
(
$action
[
'action_type'
]
==
'ispc_update'
)
{
if
(
$action
[
'action_type'
]
==
'ispc_update'
)
{
/* do the update */
/* do the update */
$this
->
_doIspCUpdate
(
$action
);
// Update function has been removed
// $this->_doIspCUpdate($action);
/* this action takes so much time,
/* this action takes so much time,
* we stop executing the actions not to waste more time */
* we stop executing the actions not to waste more time */
return
;
$this
->
_actionDone
(
$action
[
'action_id'
],
'ok'
)
;
}
}
if
(
$action
[
'action_type'
]
==
'openvz_start_vm'
)
{
if
(
$action
[
'action_type'
]
==
'openvz_start_vm'
)
{
$veid
=
intval
(
$action
[
'action_param'
]);
$veid
=
intval
(
$action
[
'action_param'
]);
...
...
server/server.sh
View file @
a2b61978
...
@@ -4,23 +4,5 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
...
@@ -4,23 +4,5 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
.
/etc/profile
.
/etc/profile
if
[
-f
/tmp/ispconfig3_install/install/autoupdate
]
;
then
cd
/usr/local/ispconfig/server
#
/usr/bin/php
-q
/usr/local/ispconfig/server/server.php
# 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
#
cd
/usr/local/ispconfig/server
/usr/bin/php
-q
/usr/local/ispconfig/server/server.php
fi
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment