diff --git a/content/ansible-example-role.rst b/content/ansible-example-role.rst index 81a79da07a8cbda07739dbf4e7aabbc50c9f538e..3d8e8884f26e12f325c85cf7eace0c3a15004eaf 100644 --- a/content/ansible-example-role.rst +++ b/content/ansible-example-role.rst @@ -89,7 +89,7 @@ A final word on boiler-plate In a previous post I mentioned that I have several repositories that have the same boiler-plate and how I plan on dealing with that. Now, this is the first attempt at this. The idea is having a base repo that I clone, add another remote -and voilĂ , a new project with the scaffloding already there. For bonus points, I +and voilĂ , a new project with the scaffolding already there. For bonus points, I can update the base repo and pull those changes in all projects. Here's how I do it: diff --git a/content/ansible-modules.rst b/content/ansible-modules.rst index 74534e91deec482c78fb3c8e0bb3bf2571dc8555..b360eba2481005c7bf399b6e2f861489614bbcfb 100644 --- a/content/ansible-modules.rst +++ b/content/ansible-modules.rst @@ -21,7 +21,7 @@ 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 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, +the modules in it. You can put them in sub-directories 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 :code:`ansible.cfg`) and create an empty :code:`__init__.py` file inside that diff --git a/content/ansible-python.rst b/content/ansible-python.rst index c89f96ab264c6dfead42e9c5bf969c3a6ae1369d..fbcc1d696d0641682ccb82d71742a067c07b013e 100644 --- a/content/ansible-python.rst +++ b/content/ansible-python.rst @@ -5,7 +5,7 @@ Using Ansible as a Python module :summary: Using Ansible as a Python module when playbooks are not enough. At my current employer we have several servers in production with various -providers, some of them with multiple ip addresses. When configuring the +providers, some of them with multiple IP addresses. When configuring the firewall to allow traffic from other servers I reached for Ansible. The obvious solution was to use a nested loop, something like this: @@ -22,7 +22,7 @@ obvious solution was to use a nested loop, something like this: However, this syntax is invalid (and other variations I tried). Using :code:`include` with :code:`with_items` is deprecated and I didn't manage 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 +programmatically generating a playbook, but investigating further I found that Ansible can be imported as a Python module. Incorporating Ansible in Python diff --git a/content/aws_change_own_password.rst b/content/aws_change_own_password.rst index 40d2d6c61d5cef62388e28df6fef4354776ce8e3..f7b18c50455f81aa818898b1eba2a68fe2db0716 100644 --- a/content/aws_change_own_password.rst +++ b/content/aws_change_own_password.rst @@ -7,7 +7,7 @@ Self service AWS IAM policy A common practice for me when a new member joins the team or when someone forgets his/ her AWS account password is to change the account password myself, -send the new password over an unsecure channel (email, Slack) but force the +send the new password over an insecure channel (email, Slack) but force the account to change the password on first login. Also, I prefer to have users manage their own keys to AWS themselves. But without the correct IAM policy users aren't able to perform either action. Here's an IAM to allow both: diff --git a/content/bundle_certs.rst b/content/bundle_certs.rst index 9132344ba6f0554e5cdba025c3a40fbb94ec6897..26d9f439842cd6e8a752c9f4a27e1dfebfd970ab 100644 --- a/content/bundle_certs.rst +++ b/content/bundle_certs.rst @@ -17,7 +17,7 @@ and `ssh-ca <https://www.shore.co.il/cgit/ssh-ca/>`_ have some commonality in how I use them and this seems like a good opportunity to share. First of all I keep my rc files (like :code:`.vimrc`) in the `rcfiles <https://www.shore.co.il/cgit/rcfiles/`>_ repo. However I don't install -them as mentioned in the documentation. Instead I add them as Git submodules +them as mentioned in the documentation. Instead I add them as Git sub modules and now I can be reasonably sure that when I clone the rcfiles repository, the aliases and sourced files mentioned in :code:`.bashrc` are present. Here's how: diff --git a/content/git_serve.rst b/content/git_serve.rst index 303e059f65fec0e74cba20a55e5a040096cca0a4..67a44d5c5edf538470a0c6f3952656233710e790 100644 --- a/content/git_serve.rst +++ b/content/git_serve.rst @@ -9,7 +9,7 @@ your git repository is quite large and your internet connection is slow or your build process would benefit from pulling from an intermediary without authentication). Here are 2 ways to serve your git repository without any configuration or software installation. Both ways serve a single repository -without authentication or encryption but readonly (no push). +without authentication or encryption but read-only (no push). Using the git protocol ---------------------- @@ -28,7 +28,7 @@ And on the client you can clone by running git clone git://servername/ reponame -Using the http protocol +Using the HTTP protocol ----------------------- This way serves the repo over HTTP using Python 2's SimpleHTTPServer. Run the diff --git a/content/pages/about.rst b/content/pages/about.rst index 415ae75e8d5407360833cdf97f1c531f54e505a0..b8b0ea26a61fa799b16074ece13d6a5aa60c3d1b 100644 --- a/content/pages/about.rst +++ b/content/pages/about.rst @@ -6,7 +6,7 @@ About me :slug: about-me Hi. -I'm Nimrod Adar, a linux and BSD sysadmin and a backend Python developer +I'm Nimrod Adar, a Linux and BSD sysadmin and a backend Python developer residing in Haifa, Israel. This is my blog about what I do and thus it serves 2 purposes. The 1st is to be diff --git a/content/resolver.rst b/content/resolver.rst index cc404bab50bc1087c1783c90dcb0b80863679a6a..1fbbcd362616c7b32b5532ecd315d722943bde3c 100644 --- a/content/resolver.rst +++ b/content/resolver.rst @@ -32,7 +32,7 @@ If you want to run just a single command (like getting the MX record for .. code:: shell - docker run adarnimrod/resovler dig +short shore.co.il mx + docker run adarnimrod/resolver dig +short shore.co.il mx How does it work ----------------