Skip to content

Commit

Permalink
backport of commit fbd215a (#16088)
Browse files Browse the repository at this point in the history
This pull request was automerged via backport-assistant
  • Loading branch information
hc-github-team-nomad-core committed Feb 7, 2023
1 parent cb5a377 commit 2536c6f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .release/linux/package/etc/nomad.d/nomad.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ data_dir = "/opt/nomad/data"
bind_addr = "0.0.0.0"

server {
# license_path is required as of Nomad v1.1.1+
#license_path = "/opt/nomad/license.hclic"
# license_path is required for Nomad Enterprise as of Nomad v1.1.1+
#license_path = "/etc/nomad.d/license.hclic"
enabled = true
bootstrap_expect = 1
}
Expand Down
2 changes: 1 addition & 1 deletion website/content/docs/commands/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,6 @@ flags.
#### Nomad Enterprise Licensing Environment Variables

- `NOMAD_LICENSE_PATH` - An absolute path to a Nomad Enterprise license file,
for example `/opt/nomad/license.hclic`.
for example `/etc/nomad.d/license.hclic`.

- `NOMAD_LICENSE` - The Nomad Enterprise license file contents as a string.
9 changes: 5 additions & 4 deletions website/content/docs/configuration/server.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,11 @@ server {
the number of CPU cores.

- `license_path` `(string: "")` - Specifies the path to load a Nomad Enterprise
license from. This must be an absolute path (`/opt/nomad/license.hclic`). The
license can also be set by setting `NOMAD_LICENSE_PATH` or by setting
`NOMAD_LICENSE` as the entire license value. `license_path` has the highest
precedence, followed by `NOMAD_LICENSE` and then `NOMAD_LICENSE_PATH`.
license from. This must be an absolute path
(ex. `/etc/nomad.d/license.hclic`). The license can also be set by setting
`NOMAD_LICENSE_PATH` or by setting `NOMAD_LICENSE` as the entire license
value. `license_path` has the highest precedence, followed by `NOMAD_LICENSE`
and then `NOMAD_LICENSE_PATH`.

- `plan_rejection_tracker` <code>([PlanRejectionTracker](#plan_rejection_tracker-parameters))</code> -
Configuration for the plan rejection tracker that the Nomad leader uses to
Expand Down

0 comments on commit 2536c6f

Please sign in to comment.