Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Helmo
ISPConfig 3
Commits
04b60934
Commit
04b60934
authored
4 years ago
by
Marius Burkard
Browse files
Options
Downloads
Patches
Plain Diff
- don't use ALTER IGNORE
parent
96cc8c08
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
install/sql/incremental/upd_dev_collection.sql
+14
-14
14 additions, 14 deletions
install/sql/incremental/upd_dev_collection.sql
with
14 additions
and
14 deletions
install/sql/incremental/upd_dev_collection.sql
+
14
−
14
View file @
04b60934
...
...
@@ -2,22 +2,22 @@
-- 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
IGNORE
TABLE
`web_domain`
ADD
COLUMN
`proxy_protocol`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`log_retention`
;
ALTER
IGNORE
TABLE
`web_domain`
ADD
`backup_format_web`
VARCHAR
(
255
)
NOT
NULL
default
'default'
AFTER
`backup_copies`
;
ALTER
IGNORE
TABLE
`web_domain`
ADD
`backup_format_db`
VARCHAR
(
255
)
NOT
NULL
default
'gzip'
AFTER
`backup_format_web`
;
ALTER
IGNORE
TABLE
`web_domain`
ADD
`backup_encrypt`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`backup_format_db`
;
ALTER
IGNORE
TABLE
`web_domain`
ADD
`backup_password`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
''
AFTER
`backup_encrypt`
;
ALTER
IGNORE
TABLE
`web_backup`
ADD
`backup_format`
VARCHAR
(
64
)
NOT
NULL
DEFAULT
''
AFTER
`backup_mode`
;
ALTER
IGNORE
TABLE
`web_backup`
ADD
`backup_password`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
''
AFTER
`filesize`
;
ALTER
IGNORE
TABLE
`web_domain`
ALTER
pm
SET
DEFAULT
'ondemand'
;
ALTER
IGNORE
TABLE
`web_domain`
DROP
COLUMN
`enable_spdy`
;
ALTER
IGNORE
TABLE
`web_domain`
ADD
`folder_directive_snippets`
TEXT
NULL
AFTER
`https_port`
;
ALTER
IGNORE
TABLE
`web_domain`
ADD
`server_php_id`
INT
(
11
)
UNSIGNED
NOT
NULL
DEFAULT
0
;
ALTER
IGNORE
TABLE
`web_domain`
CHANGE
`apache_directives`
`apache_directives`
mediumtext
NULL
DEFAULT
NULL
;
ALTER
IGNORE
TABLE
`web_domain`
CHANGE
`nginx_directives`
`nginx_directives`
mediumtext
NULL
DEFAULT
NULL
;
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
IGNORE
TABLE
`mail_user`
ADD
`forward_in_lda`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
AFTER
`cc`
;
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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment