Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
provision
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
provision
Commits
92d5dc54
There was an error fetching the commit references. Please try again later.
Commit
92d5dc54
authored
6 years ago
by
Jon Pugh
Browse files
Options
Downloads
Patches
Plain Diff
Move parent::write() to the end of the function to the code in write() actually has an effect.
parent
53ab4352
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
http/Provision/Config/Http/Ssl/Site.php
+5
-2
5 additions, 2 deletions
http/Provision/Config/Http/Ssl/Site.php
with
5 additions
and
2 deletions
http/Provision/Config/Http/Ssl/Site.php
+
5
−
2
View file @
92d5dc54
...
...
@@ -14,8 +14,6 @@ class Provision_Config_Http_Ssl_Site extends Provision_Config_Http_Site {
public
$description
=
'encrypted virtual host configuration'
;
function
write
()
{
parent
::
write
();
if
(
$this
->
ssl_enabled
&&
$this
->
ssl_key
)
{
$path
=
dirname
(
$this
->
data
[
'ssl_cert'
]);
// Make sure the ssl.d directory in the server ssl.d exists.
...
...
@@ -50,6 +48,7 @@ class Provision_Config_Http_Ssl_Site extends Provision_Config_Http_Site {
// If cert is not ok, turn off ssl_redirection.
if
(
$this
->
ssl_cert_ok
==
FALSE
)
{
$this
->
data
[
'ssl_redirection'
]
=
FALSE
;
drush_log
(
dt
(
'SSL Certificate preparation failed. SSL has been disabled for this site.'
),
'warning'
);
}
// Sync the key directory to the remote server.
...
...
@@ -57,6 +56,10 @@ class Provision_Config_Http_Ssl_Site extends Provision_Config_Http_Site {
'exclude'
=>
"
{
$path
}
/*.receipt"
,
// Don't need to synch the receipts
));
}
// Call parent's write AFTER ensuring the certificates are in place to prevent
// the vhost from referencing missing files.
parent
::
write
();
}
/**
...
...
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