From da56a4625bb5efad645e9035ac04fc50cfe8fc47 Mon Sep 17 00:00:00 2001
From: Alexander Tomokhov <alexoundos@gmail.com>
Date: Sat, 18 Nov 2023 07:43:41 +0400
Subject: [PATCH] remove SUDO_USER variable

---
 .drone.yml   | 6 ++----
 nixos-infect | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 353043f..0feeb4e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,11 +18,9 @@ steps:
   commands:
   # Create infect user script and then export it to a remote machine on server creation.
   - echo '#! /usr/bin/env bash' > infect.sh
-  - echo 'echo from machine | nc -N 128.140.94.125 8443' >> infect.sh
-  - echo 'echo sleep 1' >> infect.sh
   - echo 'exec &> >(tee >(nc -N 128.140.94.125 8443))' >> infect.sh
-  - echo 'echo "Hello, NetCat"' >> infect.sh
-  - echo "curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/hetzner-flakes/nixos-infect | PROVIDER=hetzner DOMAIN=$DOMAIN LUSER=cicdcicd ENCODED_PASSWORD=\"$(printf $USER_PASS | base64)\" CF_TOKEN=$CLOUDFLARE_TOKEN DB_PASSWORD=$USER_PASS API_TOKEN=$USER_PASS HOSTNAME=selfprivacy-ci-test DNS_PROVIDER_TYPE=CLOUDFLARE STAGING_ACME=false NIX_VERSION=2.18.2 NIXOS_CONFIG_NAME=sp-nixos CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/alexoundos/selfprivacy-nixos-top-level/archive/master.tar.gz bash 2>&1 | tee /root/infect.log" >> infect.sh
+  - echo 'echo "Hello, NetCat!"' >> infect.sh
+  - echo "curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/$DRONE_SOURCE_BRANCH/nixos-infect | PROVIDER=hetzner DOMAIN=$DOMAIN LUSER=cicdcicd ENCODED_PASSWORD=\"$(printf $USER_PASS | base64)\" CF_TOKEN=$CLOUDFLARE_TOKEN DB_PASSWORD=$USER_PASS API_TOKEN=$USER_PASS HOSTNAME=selfprivacy-ci-test DNS_PROVIDER_TYPE=CLOUDFLARE STAGING_ACME=false NIX_VERSION=2.18.2 NIXOS_CONFIG_NAME=sp-nixos CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/alexoundos/selfprivacy-nixos-top-level/archive/master.tar.gz bash 2>&1 | tee /root/infect.log" >> infect.sh
   - http -v --check-status --ignore-stdin POST https://api.hetzner.cloud/v1/servers Authorization:"Bearer $PASSWORD" name=ci-sibling server_type=cx11 start_after_create:=true image=ubuntu-20.04 user_data=@infect.sh automount:=false location=fsn1
   - echo "Wait for 100 seconds."
   - sleep 60
diff --git a/nixos-infect b/nixos-infect
index 1c2878f..d3399e2 100755
--- a/nixos-infect
+++ b/nixos-infect
@@ -16,7 +16,6 @@
 : "${ENCODED_PASSWORD:?ENCODED_PASSWORD variable is not set}"
 : "${NIX_VERSION:?NIX_VERSION variable is not set}"
 : "${NIXOS_CONFIG_NAME:?NIXOS_CONFIG_NAME variable is not set}"
-: "${SUDO_USER:?SUDO_USER variable is not set}"
 : "${CONFIG_URL:?CONFIG_URL variable is not set}"
 
 readonly LOCAL_FLAKE_DIR="/etc/nixos"