Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
84a35dd2
Commit
84a35dd2
authored
Sep 08, 2021
by
Marius Burkard
Browse files
Merge branch 'pre-release-3.2.6' into 'develop'
Pre-Release 3.2.6 See merge request
!1523
parents
c14d6c0b
be46cb19
Pipeline
#9468
passed with stage
in 19 seconds
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
helper_scripts/cert_check.sh
0 → 100644
View file @
84a35dd2
#!/bin/bash
chkdata
()
{
F
=
$1
CRT
=
$2
KEY
=
$3
if
[[
"
$CRT
"
!=
""
&&
"
$KEY
"
!=
""
]]
;
then
if
[[
!
-f
"
$CRT
"
]]
;
then
echo
"[WARN] CERTIFICATE FILE
${
CRT
}
MISSING FOR
${
F
}
"
;
else
echo
-n
"Checking
${
CRT
}
"
;
CHK
=
$(
openssl x509
-in
"
${
CRT
}
"
-text
-noout
>
/dev/null 2>&1
;
echo
$?
)
;
if
[[
$CHK
-ne
0
]]
;
then
echo
" FAILED!"
;
else
echo
" OK"
;
fi
fi
if
[[
!
-f
"
$KEY
"
]]
;
then
echo
"[WARN] KEY FILE
${
KEY
}
MISSING FOR
${
F
}
"
;
else
echo
-n
"Checking
${
KEY
}
"
;
CHK
=
$(
openssl rsa
-in
"
${
KEY
}
"
-check
-noout
>
/dev/null 2>&1
;
echo
$?
)
;
if
[[
$CHK
-ne
0
]]
;
then
echo
" FAILED!"
;
else
echo
" OK"
;
fi
fi
if
[[
-f
"
$CRT
"
&&
-f
"
$KEY
"
]]
;
then
echo
-n
"Checking that key and certificate match"
;
MDCRT
=
$(
openssl x509
-noout
-modulus
-in
"
${
CRT
}
"
| openssl md5
)
;
MDKEY
=
$(
openssl rsa
-noout
-modulus
-in
"
${
KEY
}
"
| openssl md5
)
;
if
[[
"
$MDCRT
"
!=
"
$MDKEY
"
]]
;
then
echo
" FAILED!"
;
else
echo
" OK"
;
fi
fi
echo
"---"
;
elif
[[
"
$CRT
"
!=
""
||
"
$KEY
"
!=
""
]]
;
then
echo
"[WARN] Check SSL config of
${
F
}
"
;
echo
"---"
;
fi
}
if
[[
-d
/etc/apache2/sites-enabled
]]
;
then
echo
"Checking enabled apache vhosts"
;
for
FIL
in
/etc/apache2/sites-enabled/
*
;
do
CRT
=
$(
grep
'SSLCertificateFile'
"
${
FIL
}
"
|
grep
-E
-v
'^[[:space:]]*#'
|
awk
'{print $2}'
|
head
-n
1
)
;
KEY
=
$(
grep
'SSLCertificateKeyFile'
"
${
FIL
}
"
|
grep
-E
-v
'^[[:space:]]*#'
|
awk
'{print $2}'
|
head
-n
1
)
;
chkdata
"
$FIL
"
"
$CRT
"
"
$KEY
"
;
done
fi
if
[[
-d
/etc/nginx/sites-enabled
]]
;
then
echo
"Checking enabled nginx vhosts"
;
for
FIL
in
/etc/nginx/sites-enabled/
*
;
do
CRT
=
$(
grep
'ssl_certificate'
"
${
FIL
}
"
|
grep
-E
-v
'^[[:space:]]*#'
|
awk
'{print $2}'
|
head
-n
1
)
;
CRT
=
${
CRT
%;
}
KEY
=
$(
grep
'ssl_certificate_key'
"
${
FIL
}
"
|
grep
-E
-v
'^[[:space:]]*#'
|
awk
'{print $2}'
|
head
-n
1
)
;
KEY
=
${
KEY
%;
}
chkdata
"
$FIL
"
"
$CRT
"
"
$KEY
"
;
done
fi
\ No newline at end of file
install/patches/upd_
dev_collection
.php
→
install/patches/upd_
0094
.php
View file @
84a35dd2
File moved
install/sql/incremental/upd_0094.sql
0 → 100644
View file @
84a35dd2
-- Add column for email backup limit (#5732)
ALTER
TABLE
`client_template`
ADD
`limit_mail_backup`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'y'
AFTER
`limit_spamfilter_policy`
;
ALTER
TABLE
`client`
ADD
`limit_mail_backup`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'y'
AFTER
`limit_spamfilter_policy`
;
-- default spamfilter_users.policy_id to 0
ALTER
TABLE
`spamfilter_users`
ALTER
`policy_id`
SET
DEFAULT
0
;
-- mail_forwarding.source must be unique
ALTER
TABLE
`mail_forwarding`
DROP
KEY
`server_id`
;
ALTER
TABLE
`mail_forwarding`
ADD
KEY
`server_id`
(
`server_id`
,
`source`
);
-- Purge apps & addons installer (#5795) - second time due to syntax error in 0093
DROP
TABLE
IF
EXISTS
`software_package`
;
DROP
TABLE
IF
EXISTS
`software_repo`
;
DROP
TABLE
IF
EXISTS
`software_update`
;
DROP
TABLE
IF
EXISTS
`software_update_inst`
;
-- mail_transport.domain must be unique
ALTER
TABLE
`mail_transport`
DROP
KEY
`server_id_2`
;
ALTER
TABLE
`mail_transport`
ADD
UNIQUE
KEY
`server_id_2`
(
`server_id`
,
`domain`
);
install/sql/incremental/upd_dev_collection.sql
View file @
84a35dd2
-- Add column for email backup limit (#5732)
ALTER
TABLE
`client_template`
ADD
`limit_mail_backup`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'y'
AFTER
`limit_spamfilter_policy`
;
ALTER
TABLE
`client`
ADD
`limit_mail_backup`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'y'
AFTER
`limit_spamfilter_policy`
;
-- default spamfilter_users.policy_id to 0
ALTER
TABLE
`spamfilter_users`
ALTER
`policy_id`
SET
DEFAULT
0
;
-- mail_forwarding.source must be unique
ALTER
TABLE
`mail_forwarding`
DROP
KEY
`server_id`
;
ALTER
TABLE
`mail_forwarding`
ADD
KEY
`server_id`
(
`server_id`
,
`source`
);
-- Purge apps & addons installer (#5795) - second time due to syntax error in 0093
DROP
TABLE
IF
EXISTS
`software_package`
;
DROP
TABLE
IF
EXISTS
`software_repo`
;
DROP
TABLE
IF
EXISTS
`software_update`
;
DROP
TABLE
IF
EXISTS
`software_update_inst`
;
-- mail_transport.domain must be unique
ALTER
TABLE
`mail_transport`
DROP
KEY
`server_id_2`
;
ALTER
TABLE
`mail_transport`
ADD
UNIQUE
KEY
`server_id_2`
(
`server_id`
,
`domain`
);
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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