From 03d4a70e5b37177e65c566791ac7dcdd8656478e Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar Date: Fri, 25 Jun 2021 13:04:49 +0530 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Remove=20site=20host=20entry?= =?UTF-8?q?=20on=20delete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/helper/class-ee-site.php | 3 +++ src/helper/site-utils.php | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/src/helper/class-ee-site.php b/src/helper/class-ee-site.php index ac761bc1..96518913 100644 --- a/src/helper/class-ee-site.php +++ b/src/helper/class-ee-site.php @@ -265,6 +265,9 @@ protected function delete_site( $level, $site_url, $site_fs_path, $db_data = [] \EE::log( "[$site_url] site root removed." ); } + \EE\Site\Utils\remove_etc_hosts_entry( $site_url ); + + $config_file_path = EE_ROOT_DIR . '/services/nginx-proxy/conf.d/' . $site_url . '-redirect.conf'; if ( $this->fs->exists( $config_file_path ) ) { diff --git a/src/helper/site-utils.php b/src/helper/site-utils.php index fcb69a51..eb7c7965 100644 --- a/src/helper/site-utils.php +++ b/src/helper/site-utils.php @@ -738,3 +738,12 @@ function sysctl_parameters() { return []; } + +function remove_etc_hosts_entry( $site_url ) { + $hosts_file = file_get_contents('/etc/hosts'); + + $site_url_escaped = preg_replace( '/\./', '\.', $site_url ); + $hosts_file_new = preg_replace("/127\.0\.0\.1\s+$site_url_escaped\n/",'',$hosts_file); + + file_put_contents('/etc/hosts', $hosts_file_new ); +} From f82a05113b660ad3c9c7a927039df1fe0d559e4c Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar Date: Fri, 25 Jun 2021 13:07:52 +0530 Subject: [PATCH 2/3] Add doc comment --- src/helper/class-ee-site.php | 3 +-- src/helper/site-utils.php | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/helper/class-ee-site.php b/src/helper/class-ee-site.php index 96518913..a882171a 100644 --- a/src/helper/class-ee-site.php +++ b/src/helper/class-ee-site.php @@ -267,7 +267,6 @@ protected function delete_site( $level, $site_url, $site_fs_path, $db_data = [] \EE\Site\Utils\remove_etc_hosts_entry( $site_url ); - $config_file_path = EE_ROOT_DIR . '/services/nginx-proxy/conf.d/' . $site_url . '-redirect.conf'; if ( $this->fs->exists( $config_file_path ) ) { @@ -1527,7 +1526,7 @@ protected function check_www_or_non_www_domain( $site_url, $site_path, $site_con * * [--force] * : Force renewal. - * + * * @subcommand ssl-verify * @alias ssl */ diff --git a/src/helper/site-utils.php b/src/helper/site-utils.php index eb7c7965..be0158be 100644 --- a/src/helper/site-utils.php +++ b/src/helper/site-utils.php @@ -739,6 +739,12 @@ function sysctl_parameters() { return []; } +/** + * Removes entry of the site from /etc/hosts + * + * @param string $site_url site name. + * + */ function remove_etc_hosts_entry( $site_url ) { $hosts_file = file_get_contents('/etc/hosts'); From 0a426f4f512f642db1146ab06d08991c6dcb55dc Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar Date: Mon, 28 Jun 2021 15:19:33 +0530 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20Replace=20file=5Fput=5Fconte?= =?UTF-8?q?nts=20with=20Symphony=20dumpfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/helper/site-utils.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/helper/site-utils.php b/src/helper/site-utils.php index be0158be..f98cd8d3 100644 --- a/src/helper/site-utils.php +++ b/src/helper/site-utils.php @@ -746,10 +746,12 @@ function sysctl_parameters() { * */ function remove_etc_hosts_entry( $site_url ) { - $hosts_file = file_get_contents('/etc/hosts'); + $fs = new Filesystem(); + + $hosts_file = file_get_contents( '/etc/hosts' ); $site_url_escaped = preg_replace( '/\./', '\.', $site_url ); - $hosts_file_new = preg_replace("/127\.0\.0\.1\s+$site_url_escaped\n/",'',$hosts_file); + $hosts_file_new = preg_replace( "/127\.0\.0\.1\s+$site_url_escaped\n/", '', $hosts_file ); - file_put_contents('/etc/hosts', $hosts_file_new ); + $fs->dumpFile( '/etc/hosts', $hosts_file_new ); }