Skip to content

Commit bc455b1

Browse files
authored
Merge branch 'main' into rm/compress-vagrant-images
2 parents d54e312 + 4c68ffa commit bc455b1

File tree

777 files changed

+9322
-4768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

777 files changed

+9322
-4768
lines changed

.github/actions/reload-dev-portal/action.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

.github/workflows/deploy-udr.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,8 @@ jobs:
5151
- name: Deploy Project Artifacts to Vercel
5252
run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} --logs --archive=tgz
5353

54-
- name: Reload dev portal on changed files
55-
uses: ./.github/actions/reload-dev-portal
56-
with:
57-
base_sha: ${{ github.event.before }}
58-
head_sha: ${{ github.event.after }}
59-
dev-portal-deploy-hook-prod: ${{ secrets.DEV_PORTAL_DEPLOY_HOOK_PROD }}
60-
revalidate-token: ${{ secrets.REVALIDATE_TOKEN }}
61-
bot-bypass-token: ${{ secrets.DEVELOPER_BOT_BYPASS_TOKEN }}
54+
- name: Rebuild Dev Portal
55+
shell: bash
56+
run: |
57+
echo "Rebuilding all of dev-portal"
58+
curl -X POST ${{ secrets.DEV_PORTAL_DEPLOY_HOOK_PROD }}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Force Rebuild Dev Portal
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
rebuild-dev-portal:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Rebuild Dev Portal
11+
shell: bash
12+
run: |
13+
echo "Rebuilding all of dev-portal"
14+
curl -X POST ${{ secrets.DEV_PORTAL_DEPLOY_HOOK_PROD }}

.github/workflows/force-reload-dev-portal.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

CODEOWNERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,7 @@
6868
/content/vagrant @hashicorp/Vagrant
6969

7070
# Nomad
71-
/content/nomad/ @hashicorp/nomad-docs @hashicorp/nomad-eng
71+
/content/nomad/ @hashicorp/nomad-docs @hashicorp/nomad-eng
72+
73+
# Packer
74+
/content/packer @hashicorp/team-docs-packer-and-terraform @hashicorp/packer

content/boundary/v0.20.x/content/docs/deploy/self-managed/configure-controllers.mdx

Lines changed: 100 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -304,34 +304,125 @@ Before you can start Boundary, you must initialize the database from one Boundar
304304
Initialization is a one-time operation that executes the required database migrations for the Boundary cluster to operate.
305305

306306
```shell-session
307-
boundary database init -config /etc/boundary.d/controller.hcl
307+
$ boundary database init -config /etc/boundary.d/controller.hcl
308308
```
309309

310-
Unless you configure it not to, Boundary automatically generates a number of resources to make getting started easier. It automatically generates default scopes, auth methods, user, account, and targets. These
311-
resources, however, are not required. You can add the following flags to skip creating these initial resources:
310+
Boundary automatically generates a number of resources to make getting started easier unless you specify not to. Initializing the database automatically generates default scopes, auth methods, user, account, and targets. These resources are not required.
311+
312+
You can add the following flags to skip creating these initial resources:
312313

313314
```shell-session
314-
boundary database init \
315+
$ boundary database init \
315316
-skip-auth-method-creation \
316317
-skip-host-resources-creation \
317318
-skip-scopes-creation \
318319
-skip-target-creation \
319320
-config /etc/boundary.d/controller.hcl
320321
```
321322

322-
Use the following command to view the help for additional initialization options:
323+
Use the following command to view the help for more initialization options:
323324

324325
```shell-session
325-
boundary database init -h
326+
$ boundary database init -h
326327
```
327328

328329
## Start the Boundary service
329330

330331
When the configuration files are in place on each Boundary controller, you can proceed to enable and start the binary on each of the Boundary controller nodes using `systemd`.
331-
Run the following commands to start the service:
332332

333-
1. `sudo systemctl enable boundary`
334-
1. `sudo systemctl start boundary`
333+
Run the following commands to enable and start the service:
334+
335+
1.
336+
337+
```shell-session
338+
$ sudo systemctl enable boundary
339+
```
340+
341+
1.
342+
343+
```shell-session
344+
$ sudo systemctl start boundary
345+
```
346+
347+
## Manually configure systemd (optional)
348+
349+
If you [installed Boundary manually](/boundary/docs/deploy/self-managed/install#manually-install-boundary), you can configure Boundary to run as a service under systemd.
350+
351+
To do this, you should:
352+
353+
1. Check the location of your controller configuration file on disk, such as `/etc/boundary.d/controller.hcl` in the example on this page. You will need to reference the location to the .hcl configuration file when you set up the unit file in the next steps.
354+
1. Configure the user and group the Boundary service runs under.
355+
1. Set up the systemd unit file.
356+
1. Start the Boundary service.
357+
358+
### Configure the user and group
359+
360+
HashiCorp recommends running Boundary as a non-root user and managing the Boundary process running under systemd with this user.
361+
362+
Add the `boundary` system user and group to ensure you have a no-login user that owns and runs Boundary:
363+
364+
```shell-session
365+
$ sudo adduser --system --group boundary || true ;
366+
$ sudo chown boundary:boundary /etc/boundary.d/controller.hcl ;
367+
$ sudo chown boundary:boundary /usr/local/bin/boundary
368+
```
369+
370+
<Tip>
371+
372+
Make sure to [initialize the database](#initialize-the-database) before starting the service. If another controller or worker has already done this, you will receive an expected error stating that the database has already been initialized.
373+
374+
</Tip>
375+
376+
### Set up the unit file
377+
378+
Create a new unit file, such as `/etc/systemd/system/boundary-controller.service`. Add the following code to the file. Update the path to your `controller.hcl` file on the `ExecStart` line, and the user and group as needed.
379+
380+
<CodeBlockConfig filename="/etc/systemd/system/boundary-controller.service">
381+
382+
```bash
383+
[Unit]
384+
Description="HashiCorp Boundary controller"
385+
Documentation=https://developer.hashicorp.com/boundary/docs
386+
StartLimitIntervalSec=60
387+
StartLimitBurst=3
388+
389+
[Service]
390+
EnvironmentFile=-/etc/boundary.d/boundary.env
391+
User=boundary
392+
Group=boundary
393+
ProtectSystem=full
394+
ProtectHome=read-only
395+
ExecStart=/usr/bin/boundary server -config=/etc/boundary.d/controller.hcl
396+
ExecReload=/bin/kill --signal HUP $MAINPID
397+
KillMode=process
398+
KillSignal=SIGINT
399+
Restart=on-failure
400+
RestartSec=5
401+
TimeoutStopSec=30
402+
LimitMEMLOCK=infinity
403+
404+
[Install]
405+
WantedBy=multi-user.target
406+
EOF
407+
```
408+
409+
</CodeBlockConfig>
410+
411+
### Start the Boundary service
412+
413+
Set the appropriate permissions on the unit file:
414+
415+
```shell-session
416+
$ sudo chmod 664 /etc/systemd/system/boundary-controller.service
417+
```
418+
419+
Reload the systemd daemon, and enable and start the Boundary service:
420+
421+
```shell-session
422+
$ sudo systemctl daemon-reload ;
423+
$ sudo systemctl enable boundary-controller ;
424+
$ sudo systemctl start boundary-controller
425+
```
335426

336427
## Authenticate and manage resources
337428

0 commit comments

Comments
 (0)