Merge branch 'develop' into convert/old-args-to-new

EasyEngine · Sep 6, 2018 · fc1909f · fc1909f
2 parents 18a2f42 + f88cdb0
commit fc1909f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/helper/site-utils.php b/src/helper/site-utils.php
@@ -205,15 +205,6 @@ function create_site_root( $site_fs_path, $site_url ) {
 	$fs->chown( $site_fs_path, $terminal_username );
 }
 
-/**
- * Reloads configuration of global-proxy container
- *
- * @return bool
- */
-function reload_proxy_configuration() {
-	return EE::exec( sprintf( 'docker exec %s sh -c "/app/docker-entrypoint.sh /usr/local/bin/docker-gen /app/nginx.tmpl /etc/nginx/conf.d/default.conf; /usr/sbin/nginx -s reload"', EE_PROXY_TYPE ) );
-}
-
 /**
  * Adds www to non-www redirection to site
  *

diff --git a/src/site-type/html.php b/src/site-type/html.php
@@ -217,12 +217,12 @@ private function create_site() {
 			 * when certs are being requested and http+https redirection after we have certs.
 			 */
 			\EE\Site\Utils\add_site_redirects( $this->site_data['site_url'], false, 'inherit' === $this->site_data['site_ssl'] );
-			\EE\Site\Utils\reload_proxy_configuration();
+			\EE\Site\Utils\reload_global_nginx_proxy();
 
 			if ( $this->site_data['site_ssl'] ) {
 				$this->init_ssl( $this->site_data['site_url'], $this->site_data['site_fs_path'], $this->site_data['site_ssl'], $this->site_data['site_ssl_wildcard'] );
 				\EE\Site\Utils\add_site_redirects( $this->site_data['site_url'], true, 'inherit' === $this->site_data['site_ssl'] );
-				\EE\Site\Utils\reload_proxy_configuration();
+				\EE\Site\Utils\reload_global_nginx_proxy();
 			}
 		} catch ( \Exception $e ) {
 			$this->catch_clean( $e );