Skip to content
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

Jump to bottom

Fix multiple issues #1158

Merged
merged 3 commits into from Aug 7, 2018
Merged

Fix multiple issues #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
556eae5
Fix acmephp require in composer
mrrobot47 Aug 7, 2018
15175c1
Fix message printing
mrrobot47 Aug 7, 2018
a759f1f
Add custom nginx configuration to ee-nginx-proxy
mrrobot47 Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
130 changes: 129 additions & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions php/class-ee-site.php
View file
Open in desktop
Expand Up @@ -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'] ) );
}
Expand Down
2 changes: 2 additions & 0 deletions php/site-utils.php
View file
Open in desktop
Expand Up @@ -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." );
Expand Down
2 changes: 2 additions & 0 deletions templates/custom.conf.mustache
View file
Open in desktop
@@ -0,0 +1,2 @@
server_tokens off;
client_max_body_size 100m;