correction

master
Ingolf Wagner 2018-08-19 16:28:09 +02:00
parent a10e13e619
commit f0a1fcaa8c
1 changed files with 12 additions and 12 deletions

View File

@ -18,9 +18,9 @@ with some very simple concepts.
If you're looking for a good document on how to use
[NixOps](https://nixos.org/nixops/) in the fields,
have a look at
[this excelent article](https://blog.wearewizards.io/how-to-use-nixops-in-a-team).
[this excellent article](https://blog.wearewizards.io/how-to-use-nixops-in-a-team).
# Krops vs NixOps (feature comparison)
# krops vs NixOps (feature comparison)
<table class="comparison">
<tr>
@ -30,7 +30,7 @@ have a look at
</tr>
<tr>
<td title="serverA is unstable, serverB is stable, serverC on commit=XY">
precies versioning for every machine.
precise versioning for every machine.
</td>
<td class="bad"> No </td>
<td class="good"> Yes </td>
@ -89,7 +89,7 @@ have a look at
# Krops Structure by Example
Krops is not a binary like NixOps, is a library you use to write binaries,
krops is not a binary like NixOps, is a library you use to write binaries,
which do the actual deployment.
Lets say you have a very simple `configuration.nix`
@ -154,13 +154,13 @@ This is because you need to create `/var/src/.populate` before krops will do any
Once `/var/src/.populate` is created, you can run the command `./result` again.
{{% /note %}}
Korps will copy the file `configuration.nix` into `/var/src` on `server01`
korps will copy the file `configuration.nix` into `/var/src` on `server01`
as well cloning the nixpkgs into `/var/src`.
After that krops will run `nixos-rebuild switch -I /var/src` which will provision `server01`.
## The different parts explained
Let's start with the kryptic part at the beginning.
Let's start with the cryptic part at the beginning.
```
let
@ -214,7 +214,7 @@ The list of folders and files are managed by the `source` parameter.
The keys in will be the names of the folders or files in `/var/src`.
`nixpkgs` and `nixos-config` are mandatory.
All other files/folders must be referenced in the resultint `nixos-config` file.
All other files/folders must be referenced in the resulting `nixos-config` file.
## Different Sources
@ -269,7 +269,7 @@ source = lib.evalSource [
}
];
```
This pulles the [nix-writers](https://cgit.krebsco.de/nix-writers/)
This pulls the [nix-writers](https://cgit.krebsco.de/nix-writers/)
repository
into `/var/src/nix-writers`.
@ -289,7 +289,7 @@ secrets
`-- wpa_supplicant.conf.gpg
```
Use the `.pass` argument to include the subfolder `server01`
Use the `.pass` argument to include the sub-folder `server01`
into your deployment.
```
@ -394,8 +394,8 @@ $> nix-build ./krops.nix -A all && ./result
## Update and Fixing Git commits
Updating Hashes for git repositories is anoying and using branches might break consistency.
To avoid editing files you can use use the `nix-prefetch-git` and `lib.importJson` to make
Updating Hashes for git repositories is annoying and using branches might break consistency.
To avoid editing files you can use the `nix-prefetch-git` and `lib.importJson` to make
your live easier.
```
@ -416,7 +416,7 @@ results in a file `nixpkgs.json` which looks like this
"fetchSubmodules": true
}
```
And it can be importet in `./krops.nix` like this.
And it can be imported in `./krops.nix` like this.
```
let