Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
c8509bf2
Commit
c8509bf2
authored
Nov 17, 2015
by
Marius Cramer
Browse files
- allow partly configured autoinstall.ini
parent
6c1d2417
Changes
2
Show whitespace changes
Inline
Side-by-side
install/install.php
View file @
c8509bf2
...
...
@@ -115,6 +115,10 @@ if(isset($cmd_opt['autoinstall']) && is_file($cmd_opt['autoinstall'])) {
include_once
$cmd_opt
[
'autoinstall'
];
}
elseif
(
$path_parts
[
'extension'
]
==
'ini'
)
{
$tmp
=
ini_to_array
(
file_get_contents
(
'autoinstall.ini'
));
if
(
!
is_array
(
$tmp
[
'install'
]))
$tmp
[
'install'
]
=
array
();
if
(
!
is_array
(
$tmp
[
'ssl_cert'
]))
$tmp
[
'ssl_cert'
]
=
array
();
if
(
!
is_array
(
$tmp
[
'expert'
]))
$tmp
[
'expert'
]
=
array
();
if
(
!
is_array
(
$tmp
[
'update'
]))
$tmp
[
'update'
]
=
array
();
$autoinstall
=
$tmp
[
'install'
]
+
$tmp
[
'ssl_cert'
]
+
$tmp
[
'expert'
]
+
$tmp
[
'update'
];
unset
(
$tmp
);
}
...
...
install/update.php
View file @
c8509bf2
...
...
@@ -120,6 +120,10 @@ if(isset($cmd_opt['autoinstall']) && is_file($cmd_opt['autoinstall'])) {
include_once
$cmd_opt
[
'autoinstall'
];
}
elseif
(
$path_parts
[
'extension'
]
==
'ini'
)
{
$tmp
=
ini_to_array
(
file_get_contents
(
'autoinstall.ini'
));
if
(
!
is_array
(
$tmp
[
'install'
]))
$tmp
[
'install'
]
=
array
();
if
(
!
is_array
(
$tmp
[
'ssl_cert'
]))
$tmp
[
'ssl_cert'
]
=
array
();
if
(
!
is_array
(
$tmp
[
'expert'
]))
$tmp
[
'expert'
]
=
array
();
if
(
!
is_array
(
$tmp
[
'update'
]))
$tmp
[
'update'
]
=
array
();
$autoinstall
=
$tmp
[
'install'
]
+
$tmp
[
'ssl_cert'
]
+
$tmp
[
'expert'
]
+
$tmp
[
'update'
];
unset
(
$tmp
);
}
...
...
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