Commit ec4a2c4

committed

Merge branch 'master' into dev

2 parents c102be2 + 8dc4ccd commit ec4a2c4Copy full SHA for ec4a2c4

File tree

+30

-1

lines changed

+30

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,7 @@ data/`
`19`	`19`	`nbproject/`
`20`	`20`	`/nbproject/`
`21`	`21`	`/nbproject/private/`
`22`		`-/nbproject/private/private.properties`
	`22`	`+/nbproject/private/private.properties`
	`23`	`+`
	`24`	`+# SSL Certs`
	`25`	`+etc/ssl/`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,26 @@`
	`1`	`+# Configure Local CA CERT with MacOS`
	`2`	`+`
	`3`	`+## 1. The warning you receive while developing locally.`
	`4`	`+`
	`5`	`+![Warning](images/cacert-1-warning.png)`
	`6`	`+`
	`7`	`+## 2. Open the keychain app.`
	`8`	`+`
	`9`	`+![Open Keychain](images/cacert-2-open-keychain.png)`
	`10`	`+`
	`11`	`+## 3. Use File --> Import to add the ca cert you've already created.`
	`12`	`+`
	`13`	`+![Add CA Cert](images/cacert-3-add-cacert-file-import.png)`
	`14`	`+`
	`15`	`+## 4. Once added, locate it via the search box.`
	`16`	`+`
	`17`	`+![Localhost Search Box](images/cacert-4-locate-cert.png)`
	`18`	`+`
	`19`	`+## 5. Set to always trust.`
	`20`	`+`
	`21`	`+![Trust The Cert](images/cacert-5-set-to-always-trust.png)`
	`22`	`+`
	`23`	`+## 6. Reload the webpage.`
	`24`	`+`
	`25`	`+![The Results](images/cacert-6-reload-page.png)`
	`26`	`+`