diff --git a/.drone.yml b/.drone.yml index 6683305..f6b8abf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,7 @@ steps: commands: # Create infect user script and then push it to a remote machine on server creation. - echo '#! /usr/bin/env bash' > infect.sh - - echo "curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/$INFECT_SOURCE_BRANCH/nixos-infect | PROVIDER=hetzner DOMAIN=$DOMAIN LUSER=cicdcicd USER_PASS=\"$USER_PASS\" 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.1 NIXOS_CONFIG_NAME=sp-nixos CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/master.tar.gz SSH_AUTHORIZED_KEY=\"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBb3yVhYF4slhf1iQCiGLOVcbGKP/MmkQiEMl2un+4K\" bash 2>&1 | tee /root/infect.log" >> infect.sh + - echo "curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/$INFECT_SOURCE_BRANCH/nixos-infect | PROVIDER=hetzner DOMAIN=$DOMAIN LUSER=cicdcicd USER_PASS=\"$USER_PASS\" DNS_PROVIDER_TOKEN=$CLOUDFLARE_TOKEN DNS_PROVIDER_TYPE=CLOUDFLARE DB_PASSWORD=\"$USER_PASS\" API_TOKEN=\"$USER_PASS\" HOSTNAME=selfprivacy-ci-test STAGING_ACME=false NIX_VERSION=2.18.1 NIXOS_CONFIG_NAME=sp-nixos CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/master.tar.gz SSH_AUTHORIZED_KEY=\"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBb3yVhYF4slhf1iQCiGLOVcbGKP/MmkQiEMl2un+4K\" 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 - name: dns diff --git a/nixos-infect b/nixos-infect index 1427d59..eb4daab 100755 --- a/nixos-infect +++ b/nixos-infect @@ -11,7 +11,7 @@ : "${PROVIDER:?PROVIDER variable is not set}" : "${DNS_PROVIDER_TYPE:?DNS_PROVIDER_TYPE variable is not set}" : "${STAGING_ACME:?STAGING_ACME variable is not set}" -: "${CF_TOKEN:?CF_TOKEN variable is not set}" +: "${DNS_PROVIDER_TOKEN:?DNS_PROVIDER_TOKEN variable is not set}" : "${DB_PASSWORD:?DB_PASSWORD variable is not set}" : "${USER_PASS:?USER_PASS variable is not set}" : "${NIX_VERSION:?NIX_VERSION variable is not set}" @@ -66,7 +66,7 @@ genSecrets() { }, "databasePassword": "$DB_PASSWORD", "dns": { - "apiKey": "$CF_TOKEN" + "apiKey": "$DNS_PROVIDER_TOKEN" }, "modules": { "nextcloud": {