From e6a4b916b2dad0a42c273956eb4d0fb92bfad192 Mon Sep 17 00:00:00 2001 From: James White Date: Tue, 2 Mar 2021 22:56:33 +0000 Subject: [PATCH 1/4] Update WSL cert message to mention administrator rights being needed --- pkg/certinstall/certinstall.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/certinstall/certinstall.go b/pkg/certinstall/certinstall.go index eaf461a7..6b0b762f 100644 --- a/pkg/certinstall/certinstall.go +++ b/pkg/certinstall/certinstall.go @@ -75,7 +75,7 @@ func Install(file, system string) error { // is this a wsl machine? if dist, exists := os.LookupEnv("WSL_DISTRO_NAME"); exists { user := os.Getenv("USER") - fmt.Println("Users on WSL will need to open a command prompt or terminal on Windows and run the following command:") + fmt.Println("Users on WSL will need to open an elevated (run as administrator) Command Prompt or terminal on Windows and run the following command:") fmt.Printf(`certutil -addstore -f "Root" \\wsl$\%s\home\%s\.nitro\nitro.crt\n`, dist, user) } default: From 00e3c7aec31ce53f59f7c5980fa83bff6423488e Mon Sep 17 00:00:00 2001 From: Jason McCallister Date: Wed, 3 Mar 2021 08:33:36 -0500 Subject: [PATCH 2/4] set yaml formatting on PHP settings --- pkg/config/config.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index fe319c1b..0b938424 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -403,16 +403,16 @@ func (c *Config) SetPHPStrSetting(hostname, setting, value string) error { // PHP is nested in a configuration and allows setting environment variables // for sites to override in the local development environment. type PHP struct { - DisplayErrors bool `json:"display_errors,omitempty"` - MaxExecutionTime int `json:"max_execution_time,omitempty"` - MaxInputVars int `json:"max_input_vars,omitempty"` - MaxInputTime int `json:"max_input_time,omitempty"` - MaxFileUpload string `json:"max_file_upload,omitempty"` - MemoryLimit string `json:"memory_limit,omitempty"` - OpcacheEnable bool `json:"opcache_enable,omitempty"` - OpcacheRevalidateFreq int `json:"opcache_revalidate_freq,omitempty"` - PostMaxSize string `json:"post_max_size,omitempty"` - UploadMaxFileSize string `json:"upload_max_file_size,omitempty"` + DisplayErrors bool `json:"display_errors,omitempty" yaml:"display_errors,omitempty"` + MaxExecutionTime int `json:"max_execution_time,omitempty" yaml:"max_execution_time,omitempty"` + MaxInputVars int `json:"max_input_vars,omitempty" yaml:"max_input_vars,omitempty"` + MaxInputTime int `json:"max_input_time,omitempty" yaml:"max_input_time,omitempty"` + MaxFileUpload string `json:"max_file_upload,omitempty" yaml:"max_file_upload,omitempty"` + MemoryLimit string `json:"memory_limit,omitempty" yaml:"memory_limit,omitempty"` + OpcacheEnable bool `json:"opcache_enable,omitempty" yaml:"opcache_enable,omitempty"` + OpcacheRevalidateFreq int `json:"opcache_revalidate_freq,omitempty" yaml:"opcache_revalidate_freq,omitempty"` + PostMaxSize string `json:"post_max_size,omitempty" yaml:"post_max_size,omitempty"` + UploadMaxFileSize string `json:"upload_max_file_size,omitempty" yaml:"upload_max_file_size,omitempty"` } // Load is used to return the unmarshalled config, and From eddff16478cffe57533cf65f043bc4b0019c1d36 Mon Sep 17 00:00:00 2001 From: Jason McCallister Date: Wed, 3 Mar 2021 08:38:55 -0500 Subject: [PATCH 3/4] Resolves #268 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a70d70c..26ed43f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Release Notes for Craft Nitro +## Unreleased + +### Fixed +- Fixed a bug where the `iniset` command was not updating PHP settings for sites [#268](https://github.com/craftcms/nitro/issues/268). + ## 2.0.2 - 2021-03-02 ### Fixed From 5f738ae64261053dd5ddc9076132e6f3059426f9 Mon Sep 17 00:00:00 2001 From: Jason McCallister Date: Wed, 3 Mar 2021 08:42:28 -0500 Subject: [PATCH 4/4] 2.0.3 Signed-off-by: Jason McCallister --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ed43f9..9ac0fb75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release Notes for Craft Nitro -## Unreleased +## 2.0.3 - 2021-03-03 ### Fixed - Fixed a bug where the `iniset` command was not updating PHP settings for sites [#268](https://github.com/craftcms/nitro/issues/268).