Merge branch 'release/2.0.3'

craftcms · Mar 3, 2021 · 1c63675 · 1c63675
2 parents ce296c1 + 5f738ae
commit 1c63675
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft Nitro
 
+## 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).
+
 ## 2.0.2 - 2021-03-02
 
 ### Fixed

diff --git 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:

diff --git 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