Skip to content

Commit 92e4cc4

Browse files
authored
Merge pull request #14 from cruxstack/dev
feat: switch to cloudinit provider
2 parents 466df86 + dde32cb commit 92e4cc4

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

assets/image-files/teleport-generate-config

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ get_aws_metadata() {
1818
# ------------------------------------------------------------------- config ---
1919

2020
if getent passwd teleport >/dev/null 2>&1 && getent group adm >/dev/null 2>&1; then
21-
if [ ! -d /var/lib/teleport ]; then
22-
mkdir -p /var/lib/teleport
23-
fi
24-
chown -R teleport:adm /var/lib/teleport
21+
if [ ! -d /var/lib/teleport ]; then
22+
mkdir -p /var/lib/teleport
23+
fi
24+
chown -R teleport:adm /var/lib/teleport
2525
fi
2626

2727
source "/etc/teleport.d/conf"
2828

29-
echo "${TELEPORT_ROLE}" >> "/etc/teleport.d/role.${TELEPORT_ROLE}"
29+
echo "${TELEPORT_ROLE}" >>"/etc/teleport.d/role.${TELEPORT_ROLE}"
3030

3131
INSTANCE_HOSTNAME=$(get_aws_metadata "meta-data/local-hostname")
3232
INSTANCE_PRIVATE_IP=$(get_aws_metadata "meta-data/local-ipv4")
3333

3434
export TELEPORT_NODENAME=${INSTANCE_HOSTNAME}
3535
export TELEPORT_ADVERTISE_IP=${INSTANCE_PRIVATE_IP}
3636

37-
cat "$TELEPORT_CONFIG_TEMPLATE_PATH" | envsubst > "${TELEPORT_CONFIG_PATH}"
37+
cat "$TELEPORT_CONFIG_TEMPLATE_PATH" | envsubst >"${TELEPORT_CONFIG_PATH}"
3838

3939
chmod 664 "${TELEPORT_CONFIG_PATH}"
4040
if getent passwd teleport >/dev/null 2>&1 && getent group adm >/dev/null 2>&1; then
@@ -73,5 +73,3 @@ elif [[ "${TELEPORT_ROLE}" == "node" ]]; then
7373
systemctl start --no-block teleport-node.service
7474

7575
fi
76-
77-

modules/teleport-node/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ locals {
211211

212212
# ---------------------------------------------------------------------- iam ---
213213

214-
data "template_cloudinit_config" "this" {
214+
data "cloudinit_config" "this" {
215215
count = module.this.enabled ? 1 : 0
216216

217217
gzip = true

0 commit comments

Comments
 (0)