From a95e2e29a5c65c3d28d880b088eb84956e87750d Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Sat, 5 Mar 2016 11:14:52 +0200 Subject: [PATCH] - Spelling corrections (yeah hunspell). --- content/ansible-modules.rst | 4 ++-- content/ansible-python.rst | 6 +++--- content/bundle_certs.rst | 2 +- content/pelican.rst | 4 ++-- content/sourced_or_not.rst | 4 ++-- content/ssl.rst | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/content/ansible-modules.rst b/content/ansible-modules.rst index b4ffb8e..74534e9 100644 --- a/content/ansible-modules.rst +++ b/content/ansible-modules.rst @@ -15,12 +15,12 @@ Sharing with git submodule I'd like to start by saying that git submodule is the poor man's package manager and it's lack of popularity is (somewhat) justified. However, this is a -nice demostration of a case where there is no package manager available and of +nice demonstration of a case where there is no package manager available and of using git submodule instead. Also, I've only been able to use this technique for modules written in Python, which is nice considering the lack of boiler-plate that Ansible provides and that Python is my personal preference. -The whole stroy is really quite simple, create a seperate git repository with +The whole story is really quite simple, create a separate git repository with the modules in it. You can put them in subdirectories and as a far as I know, there's no restriction on the hierarchy depth. In your playbook directory create a :code:`library` directory (the Ansible default, so you can change this in diff --git a/content/ansible-python.rst b/content/ansible-python.rst index 49c88f1..c89f96a 100644 --- a/content/ansible-python.rst +++ b/content/ansible-python.rst @@ -25,7 +25,7 @@ to get it to work with registering variables as well. What I had left was programaticaly generating a playbook, but investigating further I found that Ansible can be imported as a Python module. -Incorperating Ansible in Python +Incorporating Ansible in Python ------------------------------- To retrieve all of the ip addresses I'd ran the setup module to gather the @@ -37,7 +37,7 @@ information struct = Runner (module_name='setup', pattern='all_hosts').run() Now we have a complex data structure that is the output of Ansible's fact -gathering module. Running it in the interpeter and examining the structure is +gathering module. Running it in the interpreter and examining the structure is not hard at all and that is how I managed to write the following code to extract a list of all of our server's ip addresses. @@ -53,7 +53,7 @@ Putting that information to good use Now that we have a list of the ip addresses, we can start running Ansible commands right from with Python (just like we did) or build a playbook by -outputing a YAML file. I chose the latter. +outputting a YAML file. I chose the latter. .. code:: python diff --git a/content/bundle_certs.rst b/content/bundle_certs.rst index c0173a5..9132344 100644 --- a/content/bundle_certs.rst +++ b/content/bundle_certs.rst @@ -50,7 +50,7 @@ A third option is using a project management tool like `Cargo <http://doc.crates.io/>`_ for Rust or `Leiningen <http://leiningen.org/>`_ for Clojure. But not all aspects or languages have such tools. -The fourth option I'm thinking of is using a scaffloding tool, mainly `Yeoman +The fourth option I'm thinking of is using a scaffolding tool, mainly `Yeoman <http://yeoman.io/>`_ as it seems to the most popular one but its focus is on JS and webapps. diff --git a/content/pelican.rst b/content/pelican.rst index 78b7145..f56f9f6 100644 --- a/content/pelican.rst +++ b/content/pelican.rst @@ -7,7 +7,7 @@ What is Pelican? ---------------- `Pelican <http://blog.getpelican.com/>`_ is a static site generator. -It's written in Python, focusing on blogs, using reStructedText, Jinja2 and Fabric (but you can use Markdown and makefiles and has provisions for normal web pages as well). +It's written in Python, focusing on blogs, using reStructuredText, Jinja2 and Fabric (but you can use Markdown and makefiles and has provisions for normal web pages as well). It's a pythonic tool that's easy to use and was a breeze to setup. Installing Pelican @@ -101,7 +101,7 @@ I've also edited :code:`base.html` and :code:`article.html` inside of :code:`pel Adding an entry --------------- -Create a ReStructedText file inside of contents. The filename is for personal use and not critical. The heading is the article name and you can add the following for Pelican to use: :: +Create a ReStructuredText file inside of contents. The filename is for personal use and not critical. The heading is the article name and you can add the following for Pelican to use: :: :date: 2014-04-19 :slug: this-will-the-filename diff --git a/content/sourced_or_not.rst b/content/sourced_or_not.rst index fe7e354..68a3045 100644 --- a/content/sourced_or_not.rst +++ b/content/sourced_or_not.rst @@ -7,9 +7,9 @@ I've recently written a shell script that contained several functions and I wanted to support 2 usage methods. The first is quite regular, marking it as an executable and running it. The second is to source the script and gain the functions declared. The problem is not actually performing any tasks (or -outputing anything) if the script is being sourced. It took a bit of fiddling +outputting anything) if the script is being sourced. It took a bit of fiddling but I found a short one-liner to add at the top of the script that solves this -in a POSIX-comliant way (at least on my test machines, Debian with Bash and Dash +in a POSIX-compliant way (at least on my test machines, Debian with Bash and Dash and KSH on OpenBSD). Here is an example usage: .. code:: shell diff --git a/content/ssl.rst b/content/ssl.rst index 92082b1..ffbcb92 100644 --- a/content/ssl.rst +++ b/content/ssl.rst @@ -12,7 +12,7 @@ You have a website and you want to encrypt the traffic going in and out of your Known attacks on SSL and TLS ---------------------------- -First of all, SSL 2.0 is unsecure (it's even disabled by default in IE7) so we'll not be using it. Version roll back attacks allow a man in the middle to change the response from the client to force a lower grade (read the lowest grade possible) cipher suite. +First of all, SSL 2.0 is insecure (it's even disabled by default in IE7) so we'll not be using it. Version roll back attacks allow a man in the middle to change the response from the client to force a lower grade (read the lowest grade possible) cipher suite. The BEAST attack exploits a weakness in CBC ciphers in TLS 1.0. But fixes all major browsers have been released for quite some time, so we're going to assume that the client is secure and CBC ciphers are safe to use (reasonable assumption, but still an assumption). CRIME and BREACH exploit a weakness in compression and RC4 is considered to be weak although not broken like DES or MD5. @@ -20,7 +20,7 @@ CRIME and BREACH exploit a weakness in compression and RC4 is considered to be w IE in Windows XP ---------------- -All version of IE that are available on Windows XP offer RC4 and 3DES as the best ciphers available. Unfortunately Chrome uses the Windows scrypt library so it has the same limitaion. For a user this means that if you're on Windows XP you should be using an up-to-date version of Firefox to have the best experience until you can move from Windows XP (or Windows in general). For the website manager it leaves you with 2 options, either add support for either 3DES or RC4 ciphers with SHA1 hashes (for openssl, add RC4-SHA or 3DES-SHA at the end of the cipher list) or ask users to use Firefox if they're still on XP. I chose the latter rather then the former, but I have that luxury. +All version of IE that are available on Windows XP offer RC4 and 3DES as the best ciphers available. Unfortunately Chrome uses the Windows scrypt library so it has the same limitation. For a user this means that if you're on Windows XP you should be using an up-to-date version of Firefox to have the best experience until you can move from Windows XP (or Windows in general). For the website manager it leaves you with 2 options, either add support for either 3DES or RC4 ciphers with SHA1 hashes (for openssl, add RC4-SHA or 3DES-SHA at the end of the cipher list) or ask users to use Firefox if they're still on XP. I chose the latter rather then the former, but I have that luxury. What are we left with? ---------------------- -- GitLab