From 021b0dd10e1f6b60dc9fdbefd3b87d29aa0fc579 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 23 Aug 2020 13:57:52 -0300 Subject: Chage DNS record of prosody Terraform file changes were du to me initially trying to do this via creating a SRV DNS record. However this is not required, because Prosody is already on the $TLD sever, the only difference being that it is listening on a different port. --- nixos-switch.sh | 2 ++ secrets/secret-envrc.sh | Bin 4370 -> 4365 bytes .../plan-files/2020-08-23T12:24:00-03:00.tfplan | Bin 0 -> 3727 bytes .../plan-files/2020-08-23T12:26:57-03:00.tfplan | Bin 0 -> 3752 bytes .../plan-files/2020-08-23T12:27:04-03:00.tfplan | Bin 0 -> 3751 bytes .../plan-files/2020-08-23T13:59:22-03:00.tfplan | Bin 0 -> 3538 bytes secrets/terraform/terraform.tfstate | Bin 3062 -> 3066 bytes secrets/terraform/terraform.tfstate.backup | Bin 3068 -> 3066 bytes vps-configuration.env.nix | 1 - 9 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 secrets/terraform/plan-files/2020-08-23T12:24:00-03:00.tfplan create mode 100644 secrets/terraform/plan-files/2020-08-23T12:26:57-03:00.tfplan create mode 100644 secrets/terraform/plan-files/2020-08-23T12:27:04-03:00.tfplan create mode 100644 secrets/terraform/plan-files/2020-08-23T13:59:22-03:00.tfplan diff --git a/nixos-switch.sh b/nixos-switch.sh index 12a7dfe..404cba4 100755 --- a/nixos-switch.sh +++ b/nixos-switch.sh @@ -11,6 +11,8 @@ rsync -avzP favicons/ "${TLD}:${DATA_ROOT}/favicons/" # Ugly hack to change TLS certificates permissions echo "${USER_PASSWORD}" | ssh "$TLD" sudo -S "\ +sudo chown -R nginx:prosody /var/lib/acme/; \ +sudo chmod 755 /var/lib/acme/; \ sudo chmod 640 /var/lib/acme/${PROSODY_TLD}/key.pem; \ sudo chmod 640 /var/lib/acme/${PROSODY_TLD}/fullchain.pem; \ sudo chmod 770 /var/lib/acme/${PROSODY_TLD}/; \ diff --git a/secrets/secret-envrc.sh b/secrets/secret-envrc.sh index 4531bc0..d46dc54 100644 Binary files a/secrets/secret-envrc.sh and b/secrets/secret-envrc.sh differ diff --git a/secrets/terraform/plan-files/2020-08-23T12:24:00-03:00.tfplan b/secrets/terraform/plan-files/2020-08-23T12:24:00-03:00.tfplan new file mode 100644 index 0000000..b45dfd6 Binary files /dev/null and b/secrets/terraform/plan-files/2020-08-23T12:24:00-03:00.tfplan differ diff --git a/secrets/terraform/plan-files/2020-08-23T12:26:57-03:00.tfplan b/secrets/terraform/plan-files/2020-08-23T12:26:57-03:00.tfplan new file mode 100644 index 0000000..60c1313 Binary files /dev/null and b/secrets/terraform/plan-files/2020-08-23T12:26:57-03:00.tfplan differ diff --git a/secrets/terraform/plan-files/2020-08-23T12:27:04-03:00.tfplan b/secrets/terraform/plan-files/2020-08-23T12:27:04-03:00.tfplan new file mode 100644 index 0000000..5596dd3 Binary files /dev/null and b/secrets/terraform/plan-files/2020-08-23T12:27:04-03:00.tfplan differ diff --git a/secrets/terraform/plan-files/2020-08-23T13:59:22-03:00.tfplan b/secrets/terraform/plan-files/2020-08-23T13:59:22-03:00.tfplan new file mode 100644 index 0000000..5440843 Binary files /dev/null and b/secrets/terraform/plan-files/2020-08-23T13:59:22-03:00.tfplan differ diff --git a/secrets/terraform/terraform.tfstate b/secrets/terraform/terraform.tfstate index 88b5f11..dd862ce 100644 Binary files a/secrets/terraform/terraform.tfstate and b/secrets/terraform/terraform.tfstate differ diff --git a/secrets/terraform/terraform.tfstate.backup b/secrets/terraform/terraform.tfstate.backup index 58d3e25..615ebe2 100644 Binary files a/secrets/terraform/terraform.tfstate.backup and b/secrets/terraform/terraform.tfstate.backup differ diff --git a/vps-configuration.env.nix b/vps-configuration.env.nix index 51f8563..1ef5eb2 100644 --- a/vps-configuration.env.nix +++ b/vps-configuration.env.nix @@ -146,7 +146,6 @@ in { "${envsubstConfiguration.prosodyTLD}" = { forceSSL = true; enableACME = true; - serverAliases = [ envsubstConfiguration.prosodyMUCTLD ]; extraConfig = '' location = /favicon.ico { alias ${envsubstConfiguration.dataRoot}/favicons/conversejs.ico; -- cgit v1.2.3