From 85cecd6ecd06977767cfb87d63c40ab2eefb6d83 Mon Sep 17 00:00:00 2001
From: SPT-dev <spt-dev@noreply.dev.sp-tarkov.com>
Date: Thu, 2 Mar 2023 21:13:35 -0500
Subject: [PATCH] fix: remove quotes and add replacement step

---
 .ansible-items/inventory   |  8 ++++----
 .ansible-website/inventory |  8 ++++----
 .drone-docker.yml          | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.ansible-items/inventory b/.ansible-items/inventory
index ea04b44..f8866e8 100644
--- a/.ansible-items/inventory
+++ b/.ansible-items/inventory
@@ -3,9 +3,9 @@ all:
     sptarkov:
       hosts:
         sp-tarkov:
-          ansible_host: "{{ DEPLOY_HOSTNAME }}"
-          ansible_user: "{{ DEPLOY_USER }}"
+          ansible_host: { { DEPLOY_HOSTNAME } }
+          ansible_user: { { DEPLOY_USER } }
           ansible_connection: paramiko_ssh
-          ansible_ssh_pass: "{{ DEPLOY_SSH_KEY_PASSPHRASE }}"
-          ansible_ssh_user: "{{ DEPLOY_USER }}"
+          ansible_ssh_pass: { { DEPLOY_SSH_KEY_PASSPHRASE } }
+          ansible_ssh_user: { { DEPLOY_USER } }
           ansible_ssh_private_key_file: /drone/src/private.key # Hardcoded because created by the Drone plugin
diff --git a/.ansible-website/inventory b/.ansible-website/inventory
index ea04b44..f8866e8 100644
--- a/.ansible-website/inventory
+++ b/.ansible-website/inventory
@@ -3,9 +3,9 @@ all:
     sptarkov:
       hosts:
         sp-tarkov:
-          ansible_host: "{{ DEPLOY_HOSTNAME }}"
-          ansible_user: "{{ DEPLOY_USER }}"
+          ansible_host: { { DEPLOY_HOSTNAME } }
+          ansible_user: { { DEPLOY_USER } }
           ansible_connection: paramiko_ssh
-          ansible_ssh_pass: "{{ DEPLOY_SSH_KEY_PASSPHRASE }}"
-          ansible_ssh_user: "{{ DEPLOY_USER }}"
+          ansible_ssh_pass: { { DEPLOY_SSH_KEY_PASSPHRASE } }
+          ansible_ssh_user: { { DEPLOY_USER } }
           ansible_ssh_private_key_file: /drone/src/private.key # Hardcoded because created by the Drone plugin
diff --git a/.drone-docker.yml b/.drone-docker.yml
index 1ddc9a6..ba9094a 100644
--- a/.drone-docker.yml
+++ b/.drone-docker.yml
@@ -119,6 +119,23 @@ trigger:
     - master
 
 steps:
+  - name: replace hosts and user variables
+    image: ubuntu:impish
+    environment:
+      DEPLOY_HOSTNAME:
+        from_secret: deploy_hostname
+      DEPLOY_USER:
+        from_secret: deploy_username
+      DEPLOY_PRIVATE_KEY:
+        from_secret: deploy_ssh_key
+      DEPLOY_SSH_KEY_PASSPHRASE:
+        from_secret: deploy_ssh_key_passphrase
+    commands:
+      - echo "$DEPLOY_PRIVATE_KEY" > private.key && chmod 600 private.key
+      - sed -i 's/{{ DEPLOY_HOSTNAME }}/'"$DEPLOY_HOSTNAME"'/g' ./.ansible-website/inventory
+      - sed -i 's/{{ DEPLOY_SSH_KEY_PASSPHRASE }}/'"$DEPLOY_SSH_KEY_PASSPHRASE"'/g' ./.ansible-website/inventory
+      - sed -i 's/{{ DEPLOY_USER }}/'"$DEPLOY_USER"'/g' ./.ansible-website/inventory
+
   - name: check website ansible syntax
     image: plugins/ansible:3
     settings: