From 55a7a27d18c09e1b8db2a12da68180733c38e27e Mon Sep 17 00:00:00 2001 From: Christian Strappazzon Date: Thu, 2 Apr 2015 17:00:09 +0200 Subject: [PATCH 1/3] Added mailtrap.io --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 754cab3e..7e467140 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,8 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar``` * https://www.phplist.com/ - Hosted version allow 300 mails per months for free * https://www.mailjet.com/ - 6000 mails per months for free * https://www.sendinblue.com/ - 9000 mails per months for free - + * https://mailtrap.io - fake SMTP server for development + ## CDN and Protection * http://www.cloudflare.com/ - Basic service is free, good for a blog etc * http://www.bootstrapcdn.com/ - CDN for bootstrap, bootswatch and font awesome From 719906eff46da2257293de5b25e55643beacb960 Mon Sep 17 00:00:00 2001 From: Christian Strappazzon Date: Thu, 2 Apr 2015 18:03:53 +0200 Subject: [PATCH 2/3] Added some information on free plan --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e467140..4d1312e4 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar``` * https://www.phplist.com/ - Hosted version allow 300 mails per months for free * https://www.mailjet.com/ - 6000 mails per months for free * https://www.sendinblue.com/ - 9000 mails per months for free - * https://mailtrap.io - fake SMTP server for development + * https://mailtrap.io - fake SMTP server for development, free plan with 1 inbox, 50 messages, no team members, 2 emails/sec, no forward rules ## CDN and Protection * http://www.cloudflare.com/ - Basic service is free, good for a blog etc @@ -129,7 +129,7 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar``` * https://cloudant.com/ - Hosted database from IBM, free if usage is below $50/month * https://developer.rackspace.com/ - Rackspace Cloud gives $50/month for 12 months * https://cloud.google.com/compute/ - Google Compute Engine gives $300 over 60 days - * https://cloud.google.com/container-engine/ - Google Container Engine for run Docker containers(Alpha). Pricing: same of Google Compute Engine. + * https://cloud.google.com/container-engine/ - Google Container Engine run Docker containers(Alpha). Pricing: same of Google Compute Engine. ## DBaaS * https://mongolab.com/ - MongoDB as a service (500mb free) From ae5e23bd89d230c063f681ddcd155eede971edfc Mon Sep 17 00:00:00 2001 From: Christian Strappazzon Date: Thu, 2 Apr 2015 18:08:59 +0200 Subject: [PATCH 3/3] Fix previous delete text --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d1312e4..9492775d 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar``` * https://cloudant.com/ - Hosted database from IBM, free if usage is below $50/month * https://developer.rackspace.com/ - Rackspace Cloud gives $50/month for 12 months * https://cloud.google.com/compute/ - Google Compute Engine gives $300 over 60 days - * https://cloud.google.com/container-engine/ - Google Container Engine run Docker containers(Alpha). Pricing: same of Google Compute Engine. + * https://cloud.google.com/container-engine/ - Google Container Engine for run Docker containers(Alpha). Pricing: same of Google Compute Engine. ## DBaaS * https://mongolab.com/ - MongoDB as a service (500mb free)