diff --git a/docs/ADVANCED.md b/docs/ADVANCED.md index 6b58a10..e6af53e 100644 --- a/docs/ADVANCED.md +++ b/docs/ADVANCED.md @@ -15,7 +15,7 @@ git clone https://github.com/trailofbits/algo cd algo && ./algo ``` -**Warning**: If you run Algo on your existing server, the iptables rules will be overwritten. If you don't want to overwite the rules, you must deploy via `ansible-playbook` and skip the `iptables` tag as described below. +**Warning**: If you run Algo on your existing server, the iptables rules will be overwritten. If you don't want to overwrite the rules, you must deploy via `ansible-playbook` and skip the `iptables` tag as described below. ## Scripted Deployment diff --git a/docs/AZURE.md b/docs/AZURE.md index a38278a..909d12e 100644 --- a/docs/AZURE.md +++ b/docs/AZURE.md @@ -12,7 +12,7 @@ | 8. Go to the **Main menu**, **Azure Active Directory** and click on **Properties**. Copy and save somewhere the **Directory ID** | [![step8-thumb]][step8-screen] | | 9. Go to the **Main menu**, **Subscriptions** and click on the subscription you want you use in Algo. Copy and save the subscription id from the **Overview** tab | [![step9-thumb]][step9-screen] | | 10. Go to the **Access control (IAM)** tab and click to **Add** | [![step10-thumb]][step10-screen] | -| 11. Select a role (Contibutor will enough for all)| [![step11-thumb]][step11-screen] | +| 11. Select a role (Contributor will enough for all)| [![step11-thumb]][step11-screen] | | 12. Swith next to **Add users** and search by the **App name** (the name from the 4th step) and select it. | [![step12-thumb]][step12-screen] | Now you can use Environment Variables: diff --git a/docs/pre-install_redhat_centos_6.x.md b/docs/pre-install_redhat_centos_6.x.md index 4371a8f..ca59871 100644 --- a/docs/pre-install_redhat_centos_6.x.md +++ b/docs/pre-install_redhat_centos_6.x.md @@ -19,7 +19,7 @@ Fix GPG key warnings during Ansible rpm install: ``rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6`` -Fix GPG key warning during offical Software Collections (SCL) package install: +Fix GPG key warning during official Software Collections (SCL) package install: ``rpm --import https://raw.githubusercontent.com/sclorg/centos-release-scl/master/centos-release-scl/RPM-GPG-KEY-CentOS-SIG-SCLo`` @@ -33,7 +33,7 @@ yum -y -q install centos-release-SCL yum -y -q install python27-python-devel python27-python-setuptools python27-python-pip yum -y -q install openssl-devel libffi-devel automake gcc gcc-c++ kernel-devel wget unzip ansible nano -# Enable 2.7 default for this session (needs re-run beween logins & reboots) +# Enable 2.7 default for this session (needs re-run between logins & reboots) # shellcheck disable=SC1091 source /opt/rh/python27/enable # We're now defaulted to 2.7 diff --git a/roles/client/tasks/main.yml b/roles/client/tasks/main.yml index ae340d3..9a2fe0a 100644 --- a/roles/client/tasks/main.yml +++ b/roles/client/tasks/main.yml @@ -4,7 +4,7 @@ - name: Include system based facts and tasks include: systems/main.yml -- name: Cheking the signature algorithm +- name: Checking the signature algorithm local_action: > shell openssl x509 -text -in certs/{{ IP_subject_alt_name }}.crt | grep 'Signature Algorithm' | head -n1 become: no diff --git a/roles/cloud-digitalocean/tasks/main.yml b/roles/cloud-digitalocean/tasks/main.yml index 2251f84..a472fb5 100644 --- a/roles/cloud-digitalocean/tasks/main.yml +++ b/roles/cloud-digitalocean/tasks/main.yml @@ -68,7 +68,7 @@ - set_fact: cloud_instance_ip: "{{ do.droplet.ip_address }}" -- name: Tag the groplet +- name: Tag the droplet digital_ocean_tag: name: "Environment:Algo" resource_id: "{{ do.droplet.id }}" diff --git a/roles/dns_adblocking/templates/adblock.sh b/roles/dns_adblocking/templates/adblock.sh index 46a55d1..864e35e 100644 --- a/roles/dns_adblocking/templates/adblock.sh +++ b/roles/dns_adblocking/templates/adblock.sh @@ -31,7 +31,7 @@ awk '{sub(/\r$/,"");print $1,$2}' "$TEMP"|sort -u > "$TEMP_SORTED" #Filter (if applicable) if [ -s "/var/lib/dnsmasq/white.list" ] then - #Filter the blacklist, supressing whitelist matches + #Filter the blacklist, suppressing whitelist matches # This is relatively slow =-( echo 'Filtering white list...' egrep -v "^[[:space:]]*$" /var/lib/dnsmasq/white.list | awk '/^[^#]/ {sub(/\r$/,"");print $1}' | grep -vf - "$TEMP_SORTED" > /var/lib/dnsmasq/block.hosts diff --git a/roles/dns_adblocking/templates/dnsmasq.conf.j2 b/roles/dns_adblocking/templates/dnsmasq.conf.j2 index 69c317e..026c985 100644 --- a/roles/dns_adblocking/templates/dnsmasq.conf.j2 +++ b/roles/dns_adblocking/templates/dnsmasq.conf.j2 @@ -191,7 +191,7 @@ addn-hosts=/var/lib/dnsmasq/block.hosts # add names to the DNS for the IPv6 address of SLAAC-configured dual-stack # hosts. Use the DHCPv4 lease to derive the name, network segment and # MAC address and assume that the host will also have an -# IPv6 address calculated using the SLAAC alogrithm. +# IPv6 address calculated using the SLAAC algorithm. #dhcp-range=1234::, ra-names # Do Router Advertisements, BUT NOT DHCP for this subnet. @@ -212,7 +212,7 @@ addn-hosts=/var/lib/dnsmasq/block.hosts #dhcp-range=1234::, ra-stateless, ra-names # Do router advertisements for all subnets where we're doing DHCPv6 -# Unless overriden by ra-stateless, ra-names, et al, the router +# Unless overridden by ra-stateless, ra-names, et al, the router # advertisements will have the M and O bits set, so that the clients # get addresses and configuration from DHCPv6, and the A bit reset, so the # clients don't use SLAAC addresses. @@ -290,7 +290,7 @@ addn-hosts=/var/lib/dnsmasq/block.hosts # Give a fixed IPv6 address and name to client with # DUID 00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2 # Note the MAC addresses CANNOT be used to identify DHCPv6 clients. -# Note also the they [] around the IPv6 address are obilgatory. +# Note also the they [] around the IPv6 address are obligatory. #dhcp-host=id:00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2, fred, [1234::5] # Ignore any clients which are not specified in dhcp-host lines @@ -347,7 +347,7 @@ addn-hosts=/var/lib/dnsmasq/block.hosts # Send DHCPv6 option. Note [] around IPv6 addresses. #dhcp-option=option6:dns-server,[1234::77],[1234::88] -# Send DHCPv6 option for namservers as the machine running +# Send DHCPv6 option for nameservers as the machine running # dnsmasq and another. #dhcp-option=option6:dns-server,[::],[1234::88] @@ -527,7 +527,7 @@ addn-hosts=/var/lib/dnsmasq/block.hosts # (using /etc/hosts) then that name can be specified as the # tftp_servername (the third option to dhcp-boot) and in that # case dnsmasq resolves this name and returns the resultant IP -# addresses in round robin fasion. This facility can be used to +# addresses in round robin fashion. This facility can be used to # load balance the tftp load among a set of servers. #dhcp-boot=/var/ftpd/pxelinux.0,boothost,tftp_server_name @@ -648,7 +648,7 @@ addn-hosts=/var/lib/dnsmasq/block.hosts # Provide an alias for a "local" DNS name. Note that this _only_ works # for targets which are names from DHCP or /etc/hosts. Give host # "bert" another name, bertrand -#cname=bertand,bert +#cname=bertrand,bert # For debugging purposes, log each DNS query as it passes through # dnsmasq. diff --git a/roles/proxy/templates/pagespeed.conf.j2 b/roles/proxy/templates/pagespeed.conf.j2 index 3b89b75..026a686 100644 --- a/roles/proxy/templates/pagespeed.conf.j2 +++ b/roles/proxy/templates/pagespeed.conf.j2 @@ -62,7 +62,7 @@ ModPagespeedEnableFilters lazyload_images # Explicitly disables specific filters. This is useful in - # conjuction with ModPagespeedRewriteLevel. For instance, if one + # conjunction with ModPagespeedRewriteLevel. For instance, if one # of the filters in the CoreFilters needs to be disabled for a # site, that filter can be added to # ModPagespeedDisableFilters. This directive contains a @@ -71,7 +71,7 @@ # ModPagespeedDisableFilters rewrite_images # Explicitly enables specific filters. This is useful in - # conjuction with ModPagespeedRewriteLevel. For instance, filters + # conjunction with ModPagespeedRewriteLevel. For instance, filters # not included in the CoreFilters may be enabled using this # directive. This directive contains a comma-separated list of # filter names, and can be repeated. @@ -147,7 +147,7 @@ # ModPagespeedMaxCombinedJsBytes 92160 # Limit the number of inodes in the file cache. Set to 0 for no limit. - # The default value if this paramater is not specified is 0 (no limit). + # The default value if this parameter is not specified is 0 (no limit). ModPagespeedFileCacheInodeLimit 500000 # Bound the number of images that can be rewritten at any one time; this @@ -181,7 +181,7 @@ # ModPagespeedRewriteRandomDropPercentage 90 # Many filters modify the URLs of resources in HTML files. This is typically - # harmless but pages whose Javascript expects to read or modify the original + # harmless but pages whose JavaScript expects to read or modify the original # URLs may break. The following parameters prevent filters from modifying # URLs of their respective types. # @@ -267,7 +267,7 @@ # # You can uncomment this to let mod_pagespeed rename all JS files. # - # ModPagespeedAvoidRenamingIntrospectiveJavascript off + # ModPagespeedAvoidRenamingIntrospectiveJavaScript off # Certain common JavaScript libraries are available from Google, which acts # as a CDN and allows you to benefit from browser caching if a new visitor @@ -305,7 +305,7 @@ # Enables server-side instrumentation and statistics. If this rewriter is - # enabled, then each rewritten HTML page will have instrumentation javacript + # enabled, then each rewritten HTML page will have instrumentation javascript # added that sends latency beacons to /mod_pagespeed_beacon. These # statistics can be accessed at /mod_pagespeed_statistics. You must also # enable the mod_pagespeed_statistics and mod_pagespeed_beacon handlers diff --git a/roles/proxy/templates/privoxy_config.j2 b/roles/proxy/templates/privoxy_config.j2 index 485734c..dcbe348 100644 --- a/roles/proxy/templates/privoxy_config.j2 +++ b/roles/proxy/templates/privoxy_config.j2 @@ -998,7 +998,7 @@ enforce-blocks 0 # whole destination part are optional. # # If your system implements RFC 3493, then src_addr and dst_addr -# can be IPv6 addresses delimeted by brackets, port can be a +# can be IPv6 addresses delimited by brackets, port can be a # number or a service name, and src_masklen and dst_masklen can # be a number from 0 to 128. # diff --git a/users.yml b/users.yml index 314858d..421c581 100644 --- a/users.yml +++ b/users.yml @@ -51,7 +51,7 @@ - name: Gather Facts setup: - - name: Cheking the signature algorithm + - name: Checking the signature algorithm local_action: > shell openssl x509 -text -in certs/{{ IP_subject_alt_name }}.crt | grep 'Signature Algorithm' | head -n1 become: no