Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Dirk Dankhoff
ISPConfig 3
Commits
363cb959
Commit
363cb959
authored
Aug 17, 2015
by
Marius Cramer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
Master See merge request
!218
parents
3e783660
319dd9c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
install/install.php
install/install.php
+6
-2
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+1
-1
No files found.
install/install.php
View file @
363cb959
...
...
@@ -755,8 +755,12 @@ if($install_mode == 'standard') {
}
}
if
(
$conf
[
'openvz'
][
'installed'
]
=
true
&&
strtolower
(
$inst
->
simple_query
(
'Enable Openvz-Server'
,
array
(
'y'
,
'n'
),
'y'
,
'configure_openvz'
))
==
'y'
)
$conf
[
'services'
][
'vserver'
]
=
true
;
//* Configure OpenVZ
$force
=
@
(
$conf
[
'openvz'
][
'installed'
])
?
true
:
$inst
->
force_configure_app
(
'OpenVZ'
);
if
(
$force
)
{
$conf
[
'services'
][
'vserver'
]
=
true
;
swriteln
(
'Configuring OpenVZ'
);
}
if
(
strtolower
(
$inst
->
simple_query
(
'Configure Firewall Server'
,
array
(
'y'
,
'n'
),
'y'
,
'configure_firewall'
))
==
'y'
)
{
//* Check for Firewall
...
...
install/lib/installer_base.lib.php
View file @
363cb959
...
...
@@ -333,7 +333,7 @@ class installer_base {
$conf
[
'server_id'
]
=
$conf
[
'server_id'
];
//* Insert the same record in the local DB
$sql
=
"INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (?,1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?, 0, 1, ?, ?, ?);"
;
$sql
=
"INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (?,1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?,
?,
0, 1, ?, ?, ?);"
;
$this
->
db
->
query
(
$sql
,
$conf
[
'server_id'
],
$conf
[
'hostname'
],
$mail_server_enabled
,
$web_server_enabled
,
$dns_server_enabled
,
$file_server_enabled
,
$db_server_enabled
,
$vserver_server_enabled
,
$server_ini_content
,
$current_db_version
,
$proxy_server_enabled
,
$firewall_server_enabled
);
//* username for the ispconfig user
...
...
Write
Preview
Markdown
is supported
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