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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christian
ISPConfig 3
Commits
31e3081d
Commit
31e3081d
authored
Nov 14, 2018
by
Marius Burkard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- fixed server sql entry in installer
parent
5cd90c66
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+3
-5
No files found.
install/lib/installer_base.lib.php
View file @
31e3081d
...
...
@@ -369,13 +369,12 @@ class installer_base {
if
(
$conf
[
'mysql'
][
'master_slave_setup'
]
==
'y'
)
{
//* Insert the server record in master DB
$sql
=
"INSERT INTO `server` (`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`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?,
?,
0, 1, ?, ?, ?);"
;
$sql
=
"INSERT INTO `server` (`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`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?, 0, 1, ?, ?, ?);"
;
$this
->
dbmaster
->
query
(
$sql
,
$conf
[
'hostname'
],
$mail_server_enabled
,
$web_server_enabled
,
$dns_server_enabled
,
$file_server_enabled
,
$db_server_enabled
,
$server_ini_content
,
$current_db_version
,
$proxy_server_enabled
,
$firewall_server_enabled
);
$conf
[
'server_id'
]
=
$this
->
dbmaster
->
insertID
();
$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``, `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``, `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
,
$server_ini_content
,
$current_db_version
,
$proxy_server_enabled
,
$firewall_server_enabled
);
//* username for the ispconfig user
...
...
@@ -385,10 +384,9 @@ class installer_base {
}
else
{
//* Insert the server, if its not a mster / slave setup
$sql
=
"INSERT INTO `server` (`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`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?,
?,
0, 1, ?, ?, ?);"
;
$sql
=
"INSERT INTO `server` (`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`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?, 0, 1, ?, ?, ?);"
;
$this
->
db
->
query
(
$sql
,
$conf
[
'hostname'
],
$mail_server_enabled
,
$web_server_enabled
,
$dns_server_enabled
,
$file_server_enabled
,
$db_server_enabled
,
$server_ini_content
,
$current_db_version
,
$proxy_server_enabled
,
$firewall_server_enabled
);
$conf
[
'server_id'
]
=
$this
->
db
->
insertID
();
$conf
[
'server_id'
]
=
$conf
[
'server_id'
];
}
...
...
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