From e065803b47c588dee46a5238ef480d95719b8ad1 Mon Sep 17 00:00:00 2001 From: kitzman Date: Sun, 14 Nov 2021 18:12:52 +0200 Subject: [PATCH] license + aesthetics --- bubblewrap/inputs.tf | 2 +- bubblewrap/main.tf | 10 +++++----- bubblewrap/outputs.tf | 2 +- instance_template/base.tf | 2 +- instance_template/inputs.tf | 2 +- instance_template/instance.tf | 6 +++--- podman/inputs.tf | 2 +- podman/main.tf | 12 ++++++------ podman/outputs.tf | 2 +- scripts/setup_scripts/alpine.sh | 2 +- scripts/setup_scripts/bubblewrap.sh | 2 +- scripts/setup_scripts/znc.sh | 2 +- scripts/znc_init/znc-wrapped | 2 +- scripts/znc_init/znc-wrapped.sh | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bubblewrap/inputs.tf b/bubblewrap/inputs.tf index 0f8b3a3..ec8a360 100644 --- a/bubblewrap/inputs.tf +++ b/bubblewrap/inputs.tf @@ -1,4 +1,4 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ # Server-related variables diff --git a/bubblewrap/main.tf b/bubblewrap/main.tf index 804d872..6f5cdbd 100644 --- a/bubblewrap/main.tf +++ b/bubblewrap/main.tf @@ -1,12 +1,12 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ resource "null_resource" "provisioned_server" { connection { - host = var.server_host - port = 22 - user = "root" - agent = true + host = var.server_host + port = 22 + user = "root" + agent = true } provisioner "remote-exec" { diff --git a/bubblewrap/outputs.tf b/bubblewrap/outputs.tf index 3a9020a..c2a31d5 100644 --- a/bubblewrap/outputs.tf +++ b/bubblewrap/outputs.tf @@ -1,4 +1,4 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ # Empty for now diff --git a/instance_template/base.tf b/instance_template/base.tf index 3c1ecfc..72dc008 100644 --- a/instance_template/base.tf +++ b/instance_template/base.tf @@ -1,4 +1,4 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ terraform { diff --git a/instance_template/inputs.tf b/instance_template/inputs.tf index d3ae329..5d4e070 100644 --- a/instance_template/inputs.tf +++ b/instance_template/inputs.tf @@ -1,4 +1,4 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ # Linode-specific inputs diff --git a/instance_template/instance.tf b/instance_template/instance.tf index a66550d..267bb7d 100644 --- a/instance_template/instance.tf +++ b/instance_template/instance.tf @@ -1,4 +1,4 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ resource "linode_instance" "main_instance" { @@ -52,11 +52,11 @@ resource "linode_firewall" "main_firewall" { module "bubblewrap" { source = "../bubblewrap" - server_host = linode_instance.main_instance.ip_address + server_host = linode_instance.main_instance.ip_address } module "podman" { source = "../znc" - server_host = linode_instance.main_instance.ip_address + server_host = linode_instance.main_instance.ip_address } diff --git a/podman/inputs.tf b/podman/inputs.tf index 0f8b3a3..ec8a360 100644 --- a/podman/inputs.tf +++ b/podman/inputs.tf @@ -1,4 +1,4 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ # Server-related variables diff --git a/podman/main.tf b/podman/main.tf index c9b4a7d..c5e5326 100644 --- a/podman/main.tf +++ b/podman/main.tf @@ -1,12 +1,12 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ resource "null_resource" "provisioned_server" { connection { - host = var.server_host - port = 22 - user = "root" - agent = true + host = var.server_host + port = 22 + user = "root" + agent = true } provisioner "remote-exec" { @@ -14,7 +14,7 @@ resource "null_resource" "provisioned_server" { } provisioner "file" { - source = "../scripts/container_init/container" + source = "../scripts/container_init/container" destination = "/etc/init.d/container" } } diff --git a/podman/outputs.tf b/podman/outputs.tf index 3a9020a..c2a31d5 100644 --- a/podman/outputs.tf +++ b/podman/outputs.tf @@ -1,4 +1,4 @@ -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ # Empty for now diff --git a/scripts/setup_scripts/alpine.sh b/scripts/setup_scripts/alpine.sh index 9b90a6a..f35df31 100755 --- a/scripts/setup_scripts/alpine.sh +++ b/scripts/setup_scripts/alpine.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ cd $HOME diff --git a/scripts/setup_scripts/bubblewrap.sh b/scripts/setup_scripts/bubblewrap.sh index 859a02d..eb918db 100755 --- a/scripts/setup_scripts/bubblewrap.sh +++ b/scripts/setup_scripts/bubblewrap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ set -e diff --git a/scripts/setup_scripts/znc.sh b/scripts/setup_scripts/znc.sh index d4b7be3..6005a15 100755 --- a/scripts/setup_scripts/znc.sh +++ b/scripts/setup_scripts/znc.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ set -e diff --git a/scripts/znc_init/znc-wrapped b/scripts/znc_init/znc-wrapped index 2873b90..9645471 100755 --- a/scripts/znc_init/znc-wrapped +++ b/scripts/znc_init/znc-wrapped @@ -1,6 +1,6 @@ #!/sbin/openrc-run -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ # Upper case variables are here for backward compatibility. diff --git a/scripts/znc_init/znc-wrapped.sh b/scripts/znc_init/znc-wrapped.sh index ce61b2d..9e88aaf 100755 --- a/scripts/znc_init/znc-wrapped.sh +++ b/scripts/znc_init/znc-wrapped.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) 2021 kitzman-terraform Authors kitzman +# Copyright (C) 2021 kewl-infrastructure-utils Authors kitzman # SPDX-License-Identifier: GPL-3.0+ : ${command_user:=${command_user:-"znc"}}