From c95b9d0f62178cb6afdf5324d662108122808fd2 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Wed, 27 Dec 2023 14:05:09 +0400 Subject: [PATCH] /etc/nixos#sp-nixos => /etc/nixos#default --- .drone.yml | 4 ++-- nixos-infect | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1e8b619..74ecf02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,14 +29,14 @@ steps: set -o errexit API_TOKEN="$USER_PASS" - CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/eb9aebc8ace3f82748dc325374058df534056420.tar.gz + CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/58d43eec2f69c8fada5eea3e20b917de26bf8bb6.tar.gz DB_PASSWORD="$USER_PASS" DNS_PROVIDER_TOKEN=$CLOUDFLARE_TOKEN DNS_PROVIDER_TYPE=CLOUDFLARE DOMAIN=$DOMAIN HOSTNAME=selfprivacy-ci-test LUSER=cicdcicd - NIXOS_CONFIG_NAME=sp-nixos + NIXOS_CONFIG_ID=default NIX_VERSION=2.18.1 PROVIDER=hetzner SSH_AUTHORIZED_KEY="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBb3yVhYF4slhf1iQCiGLOVcbGKP/MmkQiEMl2un+4K" diff --git a/nixos-infect b/nixos-infect index ab2f037..01e4ef7 100755 --- a/nixos-infect +++ b/nixos-infect @@ -15,7 +15,7 @@ : "${DB_PASSWORD:?DB_PASSWORD variable is not set}" : "${USER_PASS:?USER_PASS variable is not set}" : "${NIX_VERSION:?NIX_VERSION variable is not set}" -: "${NIXOS_CONFIG_NAME:?NIXOS_CONFIG_NAME variable is not set}" +: "${NIXOS_CONFIG_ID:?NIXOS_CONFIG_ID variable is not set}" : "${CONFIG_URL:?CONFIG_URL variable is not set}" : "${SSH_AUTHORIZED_KEY:=}" @@ -424,7 +424,7 @@ infect() { echo "nix build the configuration flake..." if ! $NIX "${NIX_OPTS[@]}" build \ --profile /nix/var/nix/profiles/system \ - ${LOCAL_FLAKE_DIR}/#nixosConfigurations.sp-nixos.config.system.build.toplevel + ${LOCAL_FLAKE_DIR}/#nixosConfigurations."$NIXOS_CONFIG_ID".config.system.build.toplevel then echo "Failed!" exit 1