Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ci/vale/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ addons
addr
adduser
adminpack
adnanh
adodb
aes
ahci0
Expand Down Expand Up @@ -127,6 +128,7 @@ certbot
certcheck
cfg
cgi
chainable
changelog
changelogs
changeme
Expand Down Expand Up @@ -213,6 +215,7 @@ daemonizes
daemonizing
daemonset
dahdi
datacenter
datadir
dataset
datasets
Expand Down Expand Up @@ -240,6 +243,7 @@ defragment
deprovisioning
descolada
descr
deserialize
dest
dev
devel
Expand Down Expand Up @@ -387,11 +391,13 @@ framesets
freedns
friendster
frontend
frontmatter
fs
fsck
fstab
galera
gamemode
gamepad
gameplay
gandi
gatsby
Expand Down Expand Up @@ -711,6 +717,7 @@ mapreduce
mariadb
maskname
masterdb
masterless
mathematica
mathjax
maxconn
Expand Down Expand Up @@ -1054,6 +1061,7 @@ resolvconf
resque
restapi
retpoline
reusability
reutilize
richlanguage
rimap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ include:
- hugo.service
{{< /file >}}

Using the `include` delcaration in this way simply concatenates the `install.sls` and `service.sls` files into a single combined state file.
Using the `include` declaration in this way simply concatenates the `install.sls` and `service.sls` files into a single combined state file.

Right now, these state files only install and enable NGINX. More functionality will be enabled later in this guide.

Expand Down Expand Up @@ -413,7 +413,7 @@ Salt's GitFS fetches files from remotes periodically, and this period [can be co

hugo new site example-hugo-site

1. Navigate to the new Hugo site directory and initalize a Git repository:
1. Navigate to the new Hugo site directory and initialize a Git repository:

cd example-hugo-site
git init
Expand Down Expand Up @@ -512,7 +512,7 @@ hugo_pkg:

The first state component installs Git, and the second component installs Hugo. The second component's `sources` declaration specifies that the package should be downloaded from Hugo's GitHub repository (instead of from the distribution package manager).

The `{{ }}` syntax that appears in `{{ pillar['hugo_deployment_data']['hugo_version'] }}` is a Jinja substition statement. `pillar['hugo_deployment_data']['hugo_version']` returns the value of the `hugo_version` key from a dictionary named `hugo_deployment_data` in Pillar. Keeping the Hugo version in Pillar lets you update Hugo without needing to update your formulas.
The `{{ }}` syntax that appears in `{{ pillar['hugo_deployment_data']['hugo_version'] }}` is a Jinja substitution statement. `pillar['hugo_deployment_data']['hugo_version']` returns the value of the `hugo_version` key from a dictionary named `hugo_deployment_data` in Pillar. Keeping the Hugo version in Pillar lets you update Hugo without needing to update your formulas.

### Clone the Hugo Site Git Repository

Expand Down Expand Up @@ -550,7 +550,7 @@ The `- creates` declaration tells Salt that running the `cmd` command module wil

{{< /note >}}

The `require` delcarations in each component ensure that:
The `require` declarations in each component ensure that:

- The clone is not run until the system user and home directory have been created, and until the software package for Git has been installed.
- The user is not created until the group it belongs to is created.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Where possible, it's better to use execution modules than to "shell out" with `c

## States, Formulas, and the Top File

The previous section described how to use remote execution to perform specific actions on a minion. With remote execution, you could adminster a minion by entering a series of such commands.
The previous section described how to use remote execution to perform specific actions on a minion. With remote execution, you could administer a minion by entering a series of such commands.

Salt offers another way to configure a minion in which you declare **the state that a minion should be in**. This kind of configuration is called a Salt *state*, and the methodology is referred to generally as *configuration management*.

Expand Down Expand Up @@ -180,7 +180,7 @@ If you run the `state.apply` function with no arguments, then Salt will inspect
salt '*' state.apply

{{< note >}}
This action is colliquially known as a [*highstate*](https://docs.saltstack.com/en/latest/topics/tutorials/states_pt1.html#running-highstate).
This action is colloquially known as a [*highstate*](https://docs.saltstack.com/en/latest/topics/tutorials/states_pt1.html#running-highstate).
{{< /note >}}

### Benefits of States and Configuration Management
Expand Down Expand Up @@ -234,7 +234,7 @@ base:
- centos_setup
{{< /file >}}

Grain information generally isn't very dynamic, but it can change occassionally, and Salt will refresh its grain data when it does. To view your minions' grain data:
Grain information generally isn't very dynamic, but it can change occasionally, and Salt will refresh its grain data when it does. To view your minions' grain data:

salt '*' grains.items

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ Terraform uses a concept called [*modules*](https://www.terraform.io/docs/module

As an example, let's say that you run a web agency and need to deploy identical pairs of webservers and database servers for different clients. To facilitate this, you can create a reusable Terraform module which describes the webserver and database server pairing.

The module's description allows for variable substition of relevant attributes (passwords, keys, etc), just as in the configuration from the previous section. Once the module is configured, new servers can be instantiated for each of your clients by combining the module code with a new set of variable values.
The module's description allows for variable substitution of relevant attributes (passwords, keys, etc), just as in the configuration from the previous section. Once the module is configured, new servers can be instantiated for each of your clients by combining the module code with a new set of variable values.

### Basic Module Structure

Expand Down Expand Up @@ -666,7 +666,7 @@ modules
&emsp;&emsp;&emsp;&emsp;└── variables.tf
{{< /output >}}

1. Initiatize the Terraform configuration for the client, review the plan, and apply it:
1. Initialize the Terraform configuration for the client, review the plan, and apply it:

cd ~/terraform/client1/
terraform init
Expand Down
Loading