Skip to content

feat(redirects): check for SSL cert/key before adding redirects #455

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

Merged
merged 2 commits into from
Sep 26, 2025
Merged

feat(redirects): check for SSL cert/key before adding redirects #455

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cce450
feat(redirects): check for SSL cert/key before adding redirects
mrrobot47 Sep 26, 2025
3634da9
style(site-utils): format variable
mrrobot47 Sep 26, 2025
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
37 changes: 23 additions & 14 deletions src/helper/site-utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,22 +273,31 @@ function add_site_redirects( string $site_url, bool $ssl, bool $inherit ) {
$cert_site_name = implode( '.', array_slice( explode( '.', $site_url ), 1 ) );
}

if ( $has_www ) {
$server_name = ltrim( $site_url, '.www' );
} else {
$server_name = 'www.' . $site_url;
}
// Check for existence of cert and key files for the cert_site_name
$certs_dir = EE_ROOT_DIR . '/services/nginx-proxy/certs/';
$crt_file = $certs_dir . $cert_site_name . '.crt';
$key_file = $certs_dir . $cert_site_name . '.key';

if ( file_exists( $crt_file ) && file_exists( $key_file ) ) {
if ( $has_www ) {
$server_name = ltrim( $site_url, '.www' );
} else {
$server_name = 'www.' . $site_url;
}

$conf_data = [
'site_name' => $site_url,
'cert_site_name' => $cert_site_name,
'server_name' => $server_name,
'ssl' => $ssl,
$conf_ssl_policy => true,
];
$conf_data = [
'site_name' => $site_url,
'cert_site_name' => $cert_site_name,
'server_name' => $server_name,
'ssl' => $ssl,
$conf_ssl_policy => true,
];

$content = EE\Utils\mustache_render( SITE_TEMPLATE_ROOT . '/redirect.conf.mustache', $conf_data );
$fs->dumpFile( $config_file_path, ltrim( $content, PHP_EOL ) );
$content = EE\Utils\mustache_render( SITE_TEMPLATE_ROOT . '/redirect.conf.mustache', $conf_data );
$fs->dumpFile( $config_file_path, ltrim( $content, PHP_EOL ) );
} else {
EE::log( sprintf( 'SSL cert/key missing for %s, skipping redirect config.', $cert_site_name ) );
}
}

/**
Expand Down
Loading