aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2020-08-23 13:57:52 -0300
committerEuAndreh <eu@euandre.org>2020-08-23 13:59:43 -0300
commit021b0dd10e1f6b60dc9fdbefd3b87d29aa0fc579 (patch)
tree907589f49375fa02039fc73fe0ab5a4c26732c7d
parentUpdate prosody user (diff)
downloadserver-021b0dd10e1f6b60dc9fdbefd3b87d29aa0fc579.tar.gz
server-021b0dd10e1f6b60dc9fdbefd3b87d29aa0fc579.tar.xz
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.
-rwxr-xr-xnixos-switch.sh2
-rw-r--r--secrets/secret-envrc.shbin4370 -> 4365 bytes
-rw-r--r--secrets/terraform/plan-files/2020-08-23T12:24:00-03:00.tfplanbin0 -> 3727 bytes
-rw-r--r--secrets/terraform/plan-files/2020-08-23T12:26:57-03:00.tfplanbin0 -> 3752 bytes
-rw-r--r--secrets/terraform/plan-files/2020-08-23T12:27:04-03:00.tfplanbin0 -> 3751 bytes
-rw-r--r--secrets/terraform/plan-files/2020-08-23T13:59:22-03:00.tfplanbin0 -> 3538 bytes
-rw-r--r--secrets/terraform/terraform.tfstatebin3062 -> 3066 bytes
-rw-r--r--secrets/terraform/terraform.tfstate.backupbin3068 -> 3066 bytes
-rw-r--r--vps-configuration.env.nix1
9 files changed, 2 insertions, 1 deletions
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
--- a/secrets/secret-envrc.sh
+++ b/secrets/secret-envrc.sh
Binary files 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
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-23T12:24:00-03:00.tfplan
Binary files 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
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-23T12:26:57-03:00.tfplan
Binary files 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
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-23T12:27:04-03:00.tfplan
Binary files 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
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-23T13:59:22-03:00.tfplan
Binary files differ
diff --git a/secrets/terraform/terraform.tfstate b/secrets/terraform/terraform.tfstate
index 88b5f11..dd862ce 100644
--- a/secrets/terraform/terraform.tfstate
+++ b/secrets/terraform/terraform.tfstate
Binary files differ
diff --git a/secrets/terraform/terraform.tfstate.backup b/secrets/terraform/terraform.tfstate.backup
index 58d3e25..615ebe2 100644
--- a/secrets/terraform/terraform.tfstate.backup
+++ b/secrets/terraform/terraform.tfstate.backup
Binary files 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;