Skip to content

fix(migration): keep a site whose Let's Encrypt certificate is pending on HTTP #1955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrrobot47 wants to merge 2 commits into
base: develop
Choose a base branch
from
+20 −1
Open

fix(migration): keep a site whose Let's Encrypt certificate is pending on HTTP #1955

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b69af
fix(migration): keep a site whose Let's Encrypt certificate is pendin…
mrrobot47 Oct 26, 2026
2f4523f
docs(migration): say that is_served_without_https() decides the compo…
mrrobot47 Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion php/EE/Migration/SiteContainers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,29 @@ public static function is_site_service_image_changed( $updated_images, $site_inf
public static function generate_site_docker_compose_file( $site_info, $site_object ) {
$site_object->populate_site_info( $site_info['site_url'] );
EE::debug( "Start generating new docker-compose.yml for ${site_info['site_url']}" );
$site_object->dump_docker_compose_yml( [ 'nohttps' => ! $site_info['site_ssl'] ] );
$site_object->dump_docker_compose_yml( [ 'nohttps' => self::is_served_without_https( $site_info ) ] );
EE::debug( "Complete generating new docker-compose.yml for ${site_info['site_url']}" );
}

/**
* Whether the site's docker-compose.yml turns HTTPS off: without SSL, or while its Let's Encrypt certificate waits for `ee site ssl-verify`.
*
* With HTTPS on, nginx-proxy would serve a pending site with the closest matching certificate of another site.
*
* @param array $site_info array of site information.
*
* @return bool
*/
public static function is_served_without_https( $site_info ) {
if ( empty( $site_info['site_ssl'] ) ) {
return true;
}

// site-command versions without the pending state don't have the helper and keep HTTPS on.
return function_exists( 'EE\Site\Utils\is_le_ssl_pending' )
&& \EE\Site\Utils\is_le_ssl_pending( $site_info['site_url'], $site_info['site_ssl'] );
}

/**
* Enable site.
*
Expand Down
Loading