From ac26611e05928c7edff3c2a4a66e06977d7165f1 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Wed, 3 Feb 2016 20:39:50 +0100 Subject: [PATCH 1/3] Updated docs about Let's Encrypt --- doc/SSL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/SSL.md b/doc/SSL.md index a72eec2a16..bcff929fe5 100644 --- a/doc/SSL.md +++ b/doc/SSL.md @@ -90,8 +90,8 @@ If you run your own server, upload the files and check out the Mozilla wiki link Let's encrypt --- -If you run your own server and you control your name server, the "Let's encrypt" initiative might become an interesting alternative. -Their offer is not ready, yet. +If you run your own server, the "Let's encrypt" initiative might become an interesting alternative. +Their offer is in public beta right now. Check out [their website](https://letsencrypt.org/) for status updates. Web server settings From 5559c02662e48daea1fdb78ae5797959ee379b4d Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Wed, 3 Feb 2016 21:49:07 +0100 Subject: [PATCH 2/3] Revert "Updated docs about Let's Encrypt" This reverts commit ac26611e05928c7edff3c2a4a66e06977d7165f1. --- doc/SSL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/SSL.md b/doc/SSL.md index bcff929fe5..a72eec2a16 100644 --- a/doc/SSL.md +++ b/doc/SSL.md @@ -90,8 +90,8 @@ If you run your own server, upload the files and check out the Mozilla wiki link Let's encrypt --- -If you run your own server, the "Let's encrypt" initiative might become an interesting alternative. -Their offer is in public beta right now. +If you run your own server and you control your name server, the "Let's encrypt" initiative might become an interesting alternative. +Their offer is not ready, yet. Check out [their website](https://letsencrypt.org/) for status updates. Web server settings From 09c2e1c0a14124001997f9e03319e19116da4463 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 12 Nov 2016 10:16:56 +0100 Subject: [PATCH 3/3] Increased memory of vagrant machine to 1024 MB --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 4f1181b822..0c16fa6b8c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,6 +1,6 @@ server_ip = "192.168.22.10" -server_memory = "384" # MB +server_memory = "1024" # MB server_timezone = "UTC" public_folder = "/vagrant"