Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1,574
Issues
1,574
List
Boards
Labels
Milestones
Merge Requests
31
Merge Requests
31
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
f3027390
Commit
f3027390
authored
Oct 05, 2017
by
Marius Burkard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'stable-3.1'
parents
55c54a85
dbaeb7e6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
3 deletions
+18
-3
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+8
-0
install/lib/install.lib.php
install/lib/install.lib.php
+1
-1
interface/lib/classes/remoting.inc.php
interface/lib/classes/remoting.inc.php
+8
-1
server/lib/classes/monitor_tools.inc.php
server/lib/classes/monitor_tools.inc.php
+1
-1
No files found.
install/dist/lib/fedora.lib.php
View file @
f3027390
...
...
@@ -502,13 +502,21 @@ class installer_dist extends installer_base {
$content
=
str_replace
(
'{mysql_server_port}'
,
$conf
[
"mysql"
][
"port"
],
$content
);
$content
=
str_replace
(
'{mysql_server_ip}'
,
$conf
[
'mysql'
][
'ip'
],
$content
);
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
$content
=
str_replace
(
'{amavis_config_dir}'
,
$conf
[
'amavis'
][
'config_dir'
],
$content
);
wf
(
$conf
[
"amavis"
][
"config_dir"
]
.
'/amavisd.conf'
,
$content
);
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
0640
);
if
(
!
is_file
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/60-dkim'
))
{
touch
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/60-dkim'
);
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/60-dkim'
,
0640
);
}
// for CentOS 7.2 only
if
(
$dist
[
'confid'
]
==
'centos72'
)
{
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
0750
);
chgrp
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
'amavis'
);
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/60-dkim'
,
0750
);
chgrp
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/60-dkim'
,
'amavis'
);
}
...
...
install/lib/install.lib.php
View file @
f3027390
...
...
@@ -326,7 +326,7 @@ function get_distname() {
$distid
=
'centos53'
;
$distbaseid
=
'fedora'
;
swriteln
(
"Operating System: CentOS 5 or compatible
\n
"
);
}
elseif
(
stristr
(
$content
,
'CentOS Linux release 6'
))
{
}
elseif
(
stristr
(
$content
,
'CentOS Linux release 6'
)
||
stristr
(
$content
,
'CentOS release 6'
)
)
{
$distname
=
'CentOS'
;
$distver
=
'Unknown'
;
$distid
=
'centos53'
;
...
...
interface/lib/classes/remoting.inc.php
View file @
f3027390
...
...
@@ -246,7 +246,14 @@ class remoting {
//* Execute the SQL query
$app
->
db
->
query
(
$sql
);
$insert_id
=
$app
->
db
->
insertID
();
if
(
$app
->
db
->
errorMessage
!=
''
)
{
throw
new
SoapFault
(
'database_error'
,
$app
->
db
->
errorMessage
.
' '
.
$sql
);
return
false
;
}
if
(
isset
(
$params
[
'_primary_id'
]
))
$insert_id
=
$params
[
'_primary_id'
];
else
$insert_id
=
$app
->
db
->
insertID
();
//* Stop on error while executing the sql query
...
...
server/lib/classes/monitor_tools.inc.php
View file @
f3027390
...
...
@@ -293,7 +293,7 @@ class monitor_tools {
$distver
=
'5'
;
$distid
=
'centos53'
;
$distbaseid
=
'fedora'
;
}
elseif
(
stristr
(
$content
,
'CentOS Linux release 6'
))
{
}
elseif
(
stristr
(
$content
,
'CentOS Linux release 6'
)
||
stristr
(
$content
,
'CentOS release 6'
)
)
{
$distname
=
'CentOS'
;
$distver
=
'6'
;
$distid
=
'centos53'
;
...
...
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