Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
4a4c572c
Commit
4a4c572c
authored
Nov 20, 2020
by
Marius Burkard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- made some statements silent in update
parent
04b60934
Pipeline
#6916
passed with stage
in 11 seconds
Changes
3
Pipelines
4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
31 deletions
+29
-31
install/lib/update.lib.php
install/lib/update.lib.php
+9
-9
install/sql/incremental/upd_0091.sql
install/sql/incremental/upd_0091.sql
+20
-0
install/sql/incremental/upd_dev_collection.sql
install/sql/incremental/upd_dev_collection.sql
+0
-22
No files found.
install/lib/update.lib.php
View file @
4a4c572c
...
...
@@ -187,7 +187,7 @@ function updateDbAndIni() {
$php_patch_filename
=
realpath
(
dirname
(
__FILE__
)
.
'/../'
)
.
'/patches/upd_'
.
str_pad
(
$next_db_version
,
4
,
'0'
,
STR_PAD_LEFT
)
.
'.php'
;
// comma separated list of version numbers were a update has to be done silently
$silent_update_versions
=
'dev_collection,75'
;
$silent_update_versions
=
'dev_collection,75
,91
'
;
if
(
is_file
(
$sql_patch_filename
))
{
...
...
install/sql/incremental/upd_0091.sql
0 → 100644
View file @
4a4c572c
-- we need those to fix some installations failing in 0089 and 0090
ALTER
TABLE
`web_domain`
ROW_FORMAT
=
DYNAMIC
;
ALTER
TABLE
`mail_user`
ROW_FORMAT
=
DYNAMIC
;
ALTER
TABLE
`web_domain`
ADD
COLUMN
`proxy_protocol`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`log_retention`
;
ALTER
TABLE
`web_domain`
ADD
`backup_format_web`
VARCHAR
(
255
)
NOT
NULL
default
'default'
AFTER
`backup_copies`
;
ALTER
TABLE
`web_domain`
ADD
`backup_format_db`
VARCHAR
(
255
)
NOT
NULL
default
'gzip'
AFTER
`backup_format_web`
;
ALTER
TABLE
`web_domain`
ADD
`backup_encrypt`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`backup_format_db`
;
ALTER
TABLE
`web_domain`
ADD
`backup_password`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
''
AFTER
`backup_encrypt`
;
ALTER
TABLE
`web_backup`
ADD
`backup_format`
VARCHAR
(
64
)
NOT
NULL
DEFAULT
''
AFTER
`backup_mode`
;
ALTER
TABLE
`web_backup`
ADD
`backup_password`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
''
AFTER
`filesize`
;
ALTER
TABLE
`web_domain`
ALTER
pm
SET
DEFAULT
'ondemand'
;
ALTER
TABLE
`web_domain`
DROP
COLUMN
`enable_spdy`
;
ALTER
TABLE
`web_domain`
ADD
`folder_directive_snippets`
TEXT
NULL
AFTER
`https_port`
;
ALTER
TABLE
`web_domain`
ADD
`server_php_id`
INT
(
11
)
UNSIGNED
NOT
NULL
DEFAULT
0
;
ALTER
TABLE
`web_domain`
CHANGE
`apache_directives`
`apache_directives`
mediumtext
NULL
DEFAULT
NULL
;
ALTER
TABLE
`web_domain`
CHANGE
`nginx_directives`
`nginx_directives`
mediumtext
NULL
DEFAULT
NULL
;
UPDATE
`web_domain`
as
w
LEFT
JOIN
sys_group
as
g
ON
(
g
.
groupid
=
w
.
sys_groupid
)
INNER
JOIN
`server_php`
as
p
ON
(
w
.
fastcgi_php_version
=
CONCAT
(
p
.
name
,
':'
,
p
.
php_fastcgi_binary
,
':'
,
p
.
php_fastcgi_ini_dir
)
AND
p
.
server_id
IN
(
0
,
w
.
server_id
)
AND
p
.
client_id
IN
(
0
,
g
.
client_id
))
SET
w
.
server_php_id
=
p
.
server_php_id
,
w
.
fastcgi_php_version
=
''
WHERE
w
.
server_php_id
=
0
;
UPDATE
`web_domain`
as
w
LEFT
JOIN
sys_group
as
g
ON
(
g
.
groupid
=
w
.
sys_groupid
)
INNER
JOIN
`server_php`
as
p
ON
(
w
.
fastcgi_php_version
=
CONCAT
(
p
.
name
,
':'
,
p
.
php_fpm_init_script
,
':'
,
p
.
php_fpm_ini_dir
,
':'
,
p
.
php_fpm_pool_dir
)
AND
p
.
server_id
IN
(
0
,
w
.
server_id
)
AND
p
.
client_id
IN
(
0
,
g
.
client_id
))
SET
w
.
server_php_id
=
p
.
server_php_id
,
w
.
fastcgi_php_version
=
''
WHERE
w
.
server_php_id
=
0
;
ALTER
TABLE
`mail_user`
ADD
`forward_in_lda`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
AFTER
`cc`
;
-- end of fixes
\ No newline at end of file
install/sql/incremental/upd_dev_collection.sql
View file @
4a4c572c
-- we need those to fix some installations failing in 0089 and 0090
ALTER
TABLE
`web_domain`
ROW_FORMAT
=
DYNAMIC
;
ALTER
TABLE
`mail_user`
ROW_FORMAT
=
DYNAMIC
;
ALTER
TABLE
`web_domain`
ADD
COLUMN
`proxy_protocol`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`log_retention`
;
ALTER
TABLE
`web_domain`
ADD
`backup_format_web`
VARCHAR
(
255
)
NOT
NULL
default
'default'
AFTER
`backup_copies`
;
ALTER
TABLE
`web_domain`
ADD
`backup_format_db`
VARCHAR
(
255
)
NOT
NULL
default
'gzip'
AFTER
`backup_format_web`
;
ALTER
TABLE
`web_domain`
ADD
`backup_encrypt`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`backup_format_db`
;
ALTER
TABLE
`web_domain`
ADD
`backup_password`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
''
AFTER
`backup_encrypt`
;
ALTER
TABLE
`web_backup`
ADD
`backup_format`
VARCHAR
(
64
)
NOT
NULL
DEFAULT
''
AFTER
`backup_mode`
;
ALTER
TABLE
`web_backup`
ADD
`backup_password`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
''
AFTER
`filesize`
;
ALTER
TABLE
`web_domain`
ALTER
pm
SET
DEFAULT
'ondemand'
;
ALTER
TABLE
`web_domain`
DROP
COLUMN
`enable_spdy`
;
ALTER
TABLE
`web_domain`
ADD
`folder_directive_snippets`
TEXT
NULL
AFTER
`https_port`
;
ALTER
TABLE
`web_domain`
ADD
`server_php_id`
INT
(
11
)
UNSIGNED
NOT
NULL
DEFAULT
0
;
ALTER
TABLE
`web_domain`
CHANGE
`apache_directives`
`apache_directives`
mediumtext
NULL
DEFAULT
NULL
;
ALTER
TABLE
`web_domain`
CHANGE
`nginx_directives`
`nginx_directives`
mediumtext
NULL
DEFAULT
NULL
;
UPDATE
`web_domain`
as
w
LEFT
JOIN
sys_group
as
g
ON
(
g
.
groupid
=
w
.
sys_groupid
)
INNER
JOIN
`server_php`
as
p
ON
(
w
.
fastcgi_php_version
=
CONCAT
(
p
.
name
,
':'
,
p
.
php_fastcgi_binary
,
':'
,
p
.
php_fastcgi_ini_dir
)
AND
p
.
server_id
IN
(
0
,
w
.
server_id
)
AND
p
.
client_id
IN
(
0
,
g
.
client_id
))
SET
w
.
server_php_id
=
p
.
server_php_id
,
w
.
fastcgi_php_version
=
''
WHERE
w
.
server_php_id
=
0
;
UPDATE
`web_domain`
as
w
LEFT
JOIN
sys_group
as
g
ON
(
g
.
groupid
=
w
.
sys_groupid
)
INNER
JOIN
`server_php`
as
p
ON
(
w
.
fastcgi_php_version
=
CONCAT
(
p
.
name
,
':'
,
p
.
php_fpm_init_script
,
':'
,
p
.
php_fpm_ini_dir
,
':'
,
p
.
php_fpm_pool_dir
)
AND
p
.
server_id
IN
(
0
,
w
.
server_id
)
AND
p
.
client_id
IN
(
0
,
g
.
client_id
))
SET
w
.
server_php_id
=
p
.
server_php_id
,
w
.
fastcgi_php_version
=
''
WHERE
w
.
server_php_id
=
0
;
ALTER
TABLE
`mail_user`
ADD
`forward_in_lda`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
AFTER
`cc`
;
-- end of fixes
-- drop old php column because new installations don't have them (fails in multi-server)
ALTER
TABLE
`web_domain`
DROP
COLUMN
`fastcgi_php_version`
;
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