diff --git a/src/PHP.php b/src/PHP.php index 159245b..64a7807 100644 --- a/src/PHP.php +++ b/src/PHP.php @@ -299,7 +299,7 @@ public function create( $args, $assoc_args ) { $this->site_data['db_port'] = empty( $arg_host_port[1] ) ? '3306' : $arg_host_port[1]; } } - $this->site_data['app_admin_email'] = \EE\Utils\get_flag_value( $assoc_args, 'admin_email', strtolower( 'admin@' . $this->site_data['site_url'] ) ); + $this->site_data['app_admin_email'] = \EE\Utils\get_flag_value( $assoc_args, 'admin-email', strtolower( 'admin@' . $this->site_data['site_url'] ) ); $this->skip_status_check = \EE\Utils\get_flag_value( $assoc_args, 'skip-status-check' ); $this->force = \EE\Utils\get_flag_value( $assoc_args, 'force' ); @@ -476,7 +476,7 @@ private function configure_site_files() { // Assign www-data user ownership. chdir( $this->site_data['site_fs_path'] ); - \EE_DOCKER::docker_compose_exec( sprintf( 'chown -R www-data: %s', $this->site_data['site_container_fs_path'], 'php', 'bash', 'root' ) ); + \EE_DOCKER::docker_compose_exec( 'chown -R www-data: /var/www/', 'php', 'bash', 'root' ); \EE::success( 'Configuration files copied.' ); } catch ( \Exception $e ) { @@ -973,7 +973,7 @@ private function catch_clean( $e ) { $this->delete_site( $this->level, $this->site_data['site_url'], $this->site_data['site_fs_path'], $db_data ); \EE\Utils\delem_log( 'site cleanup end' ); \EE::log( 'Report bugs here: https://github.com/EasyEngine/site-type-php' ); - exit; + exit( 1 ); } /** @@ -990,7 +990,7 @@ protected function rollback() { $this->delete_site( $this->level, $this->site_data['site_url'], $this->site_data['site_fs_path'], $db_data ); } \EE::success( 'Rollback complete. Exiting now.' ); - exit; + exit( 1 ); } }