Merge branch 'mrrobot47-fix/acmephp-require-in-composer' into develop-v4

Author: mbtamuli

composer.json

@@ -25,6 +25,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.0",
+        "acmephp/core": "dev-master",
         "composer/composer": "^1.2.0",
         "composer/semver": "~1.0",
         "easyengine/cron-command": "v1.0.0-beta.2",

composer.lock

@@ -219,10 +219,10 @@ public function up( $args, $assoc_args ) {
 		if ( EE::db()::site_enabled( $this->site['name'] ) && ! $force ) {
 			EE::error( sprintf( '%s is already enabled!', $this->site['name'] ) );
 		}
-		EE::log( "Enabling site $this->site['name']." );
+		EE::log( sprintf( 'Enabling site %s.', $this->site['name'] ) );
 		if ( EE::docker()::docker_compose_up( $this->site['root'] ) ) {
 			EE::db()::update( [ 'is_enabled' => '1' ], [ 'sitename' => $this->site['name'] ] );
-			EE::success( "Site $this->site['name'] enabled." );
+			EE::success( sprintf( 'Site %s enabled.', $this->site['name'] ) );
 		} else {
 			EE::error( sprintf( 'There was error in enabling %s. Please check logs.', $this->site['name'] ) );
 		}

php/class-ee-site.php

@@ -90,6 +90,8 @@ function init_checks() {
 
 
 			if ( EE::docker()::boot_container( $proxy_type, $ee_proxy_command ) ) {
+				$fs = new Filesystem();
+				$fs->dumpFile( "$EE_CONF_ROOT/nginx/conf.d/custom.conf", file_get_contents( EE_ROOT . '/templates/custom.conf.mustache' ) );
 				EE::success( "$proxy_type container is up." );
 			} else {
 				EE::error( "There was some error in starting $proxy_type container. Please check logs." );

php/site-utils.php

@@ -0,0 +1,2 @@
+server_tokens off;
+client_max_body_size 100m;