WIP: reenable prosody and matterbridge, and add PDFs

11 files changed, 25 insertions, 21 deletions

diff --git a/TODOs.org b/TODOs.org
index 7b6baca..961cd23 100644
--- a/TODOs.org
+++ b/TODOs.org
@@ -1,3 +1,4 @@
+MUC
 * Tasks - v4
 ** DONE Prosody in localhost
 CLOSED: [2020-08-14 ven. 09:29]
diff --git a/nixos-switch.sh b/nixos-switch.sh
index c972ea4..2ef7533 100755
--- a/nixos-switch.sh
+++ b/nixos-switch.sh
@@ -10,10 +10,10 @@ echo "${USER_PASSWORD}" | ssh "$TLD" sudo -S -i nixos-rebuild switch --upgrade
 
 # Ugly hack to change TLS certificates permissions
 echo "${USER_PASSWORD}" | ssh "$TLD" sudo -S "\
-sudo chmod 640 /var/lib/acme/chat.arrobaponto.org/key.pem;                 \
-sudo chmod 640 /var/lib/acme/chat.arrobaponto.org/fullchain.pem;           \
-sudo chmod 770 /var/lib/acme/chat.arrobaponto.org/;                        \
-sudo chown nginx:prosody /var/lib/acme/chat.arrobaponto.org/fullchain.pem; \
-sudo chown nginx:prosody /var/lib/acme/chat.arrobaponto.org/key.pem;       \
-sudo chown nginx:prosody /var/lib/acme/chat.arrobaponto.org/;              \
+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}/;                        \
+sudo chown nginx:prosody /var/lib/acme/${PROSODY_TLD}/fullchain.pem; \
+sudo chown nginx:prosody /var/lib/acme/${PROSODY_TLD}/key.pem;       \
+sudo chown nginx:prosody /var/lib/acme/${PROSODY_TLD}/;              \
 sudo systemctl restart prosody.service"
diff --git a/secrets/secret-envrc.sh b/secrets/secret-envrc.sh
index ff9d1cc..3d0262a 100644
--- a/secrets/secret-envrc.sh
+++ b/secrets/secret-envrc.sh
diff --git a/secrets/terraform/plan-files/2020-08-22T17:23:08-03:00.tfplan b/secrets/terraform/plan-files/2020-08-22T17:23:08-03:00.tfplan
new file mode 100644
index 0000000..ca25bde
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-22T17:23:08-03:00.tfplan
diff --git a/secrets/terraform/plan-files/2020-08-22T17:27:37-03:00.tfplan b/secrets/terraform/plan-files/2020-08-22T17:27:37-03:00.tfplan
new file mode 100644
index 0000000..e99607e
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-22T17:27:37-03:00.tfplan
diff --git a/secrets/terraform/plan-files/2020-08-22T18:43:47-03:00.tfplan b/secrets/terraform/plan-files/2020-08-22T18:43:47-03:00.tfplan
new file mode 100644
index 0000000..6640667
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-22T18:43:47-03:00.tfplan
diff --git a/secrets/terraform/plan-files/2020-08-22T18:43:59-03:00.tfplan b/secrets/terraform/plan-files/2020-08-22T18:43:59-03:00.tfplan
new file mode 100644
index 0000000..fbdbd94
--- /dev/null
+++ b/secrets/terraform/plan-files/2020-08-22T18:43:59-03:00.tfplan
diff --git a/secrets/terraform/terraform.tfstate b/secrets/terraform/terraform.tfstate
index 67797c8..b1f1708 100644
--- a/secrets/terraform/terraform.tfstate
+++ b/secrets/terraform/terraform.tfstate
diff --git a/secrets/terraform/terraform.tfstate.backup b/secrets/terraform/terraform.tfstate.backup
index bddf8b1..9945241 100644
--- a/secrets/terraform/terraform.tfstate.backup
+++ b/secrets/terraform/terraform.tfstate.backup
diff --git a/terraform-apply.sh b/terraform-apply.sh
index ae75fb4..8179b96 100755
--- a/terraform-apply.sh
+++ b/terraform-apply.sh
@@ -9,5 +9,5 @@ terraform init
 PLAN_FILE="./secrets/terraform/plan-files/$(date -Iseconds).tfplan"
 terraform plan -out="${PLAN_FILE}"
 # shellcheck disable=2162
-read -p "Is the above Terraform plan acceptable?."
+read -p "Is the above Terraform plan acceptable? Press CTRL+c to cancel."
 terraform apply "${PLAN_FILE}"
diff --git a/vps-configuration.env.nix b/vps-configuration.env.nix
index 831a714..7339d85 100644
--- a/vps-configuration.env.nix
+++ b/vps-configuration.env.nix
@@ -7,6 +7,7 @@ let
     gitTLD = "$GIT_TLD";
     prosodyTLD = "$PROSODY_TLD";
     bonecoTLD = "$BONECO_TLD";
+    pdfsTLD = "$PDFS_TLD";
     letsencryptEmail = "$LETSENCRYPT_EMAIL";
     authorizedKey = "$AUTHORIZED_KEY";
     userPassword = "$USER_PASSWORD";
@@ -23,8 +24,7 @@ let
     prosodyMUCTLD = "$PROSODY_MUC_TLD";
     prosodyPort = "$PROSODY_PORT";
     prosodyHTTPPort = "$PROSODY_HTTP_PORT";
-    matterbridgeTelegramToken = "$MATTERBRIDGE_TELEGRAM_TOKEN";
-    matterbridgeTelegramChannel = "$MATTERBRIDGE_TELEGRAM_CHANNEL";
+    matterbridgeWhatsappNumber = "$MATTERBRIDGE_WHATSAPP_NUMBER";
     matterbridgeBotJID = "$MATTERBRIDGE_BOT_JID";
     matterbridgeBotPassword = "$MATTERBRIDGE_BOT_PASSWORD";
     matterbridgeBotNick = "$MATTERBRIDGE_BOT_NICK";
@@ -32,10 +32,11 @@ let
     matterbridgeXMPPServer = "$MATTERBRIDGE_XMPP_SERVER";
     matterbridgeXMPPChannel = "$MATTERBRIDGE_XMPP_CHANNEL";
   };
-  boneco = pkgs.stdenv.mkDerivation {
-    name = "boneco";
+  staticSiteFromRepo = repoName:
+    pkgs.stdenv.mkDerivation {
+    name = repoName;
     src =
-      fetchTarball "https://git.sr.ht/~euandreh/boneco/archive/master.tar.gz";
+      fetchTarball "https://git.sr.ht/~euandreh/${DOLLAR}{repoName}/archive/master.tar.gz";
     phases = "unpackPhase buildPhase";
     buildPhase = ''
       mkdir ${DOLLAR}out
@@ -111,7 +112,12 @@ in {
         "${envsubstConfiguration.bonecoTLD}" = {
           forceSSL = true;
           enableACME = true;
-          root = boneco;
+          root = staticSiteFromRepo "boneco";
+        };
+        "${envsubstConfiguration.pdfsTLD}" = {
+          forceSSL = true;
+          enableACME = true;
+          root = staticSiteFromRepo "pdfs-da-d-maria";
         };
         "${envsubstConfiguration.prosodyTLD}" = {
           forceSSL = true;
@@ -184,17 +190,14 @@ in {
           };
         };
       };
-      # muc = [{
-      #   domain = envsubstConfiguration.prosodyMUCTLD;
-      # }];
     };
 
     matterbridge = {
       enable = true;
       configFile = ''
-        [telegram.mytelegram]
-        Token="${envsubstConfiguration.matterbridgeTelegramToken}"
-        RemoteNickFormat="[{PROTOCOL}] <{NICK}>"
+        [whatsapp.mywhatsapp]
+        Number="${envsubstConfiguration.matterbridgeWhatsappNumber}"
+        RemoteNickFormat="[{PROTOCOL}] @<{NICK}>:"
 
         [xmpp.myxmpp]
         Server="${envsubstConfiguration.matterbridgeXMPPServer}"
@@ -209,8 +212,8 @@ in {
         enable=true
 
         [[gateway.inout]]
-        account="telegram.mytelegram"
-        channel="${envsubstConfiguration.matterbridgeTelegramChannel}"
+        account="whatsapp.mywhatsapp"
+        channel="dunno"
 
         [[gateway.inout]]
         account="xmpp.myxmpp"