SelfPrivacy
/
selfprivacy-nixos-infect
6
3
Fork 1
Code Issues 3 Pull Requests Releases Wiki Activity

uppercase PROVIDER variable value

api-3.0
Alexander 2023-12-28 20:07:59 +04:00
parent 15f36551ad
commit 743129d6cb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -34,7 +34,7 @@ steps:
trap 'echo \$LINENO: "\$BASH_COMMAND"; exit 1' ERR trap 'echo \$LINENO: "\$BASH_COMMAND"; exit 1' ERR
API_TOKEN="$USER_PASS" API_TOKEN="$USER_PASS"
CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/4d18c8dba9765bde9040ddf1c285bec96ba23f43.tar.gz CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/2569a42a73e359b21c7c86b4ee413fb435ec8db3.tar.gz
DNS_PROVIDER_TOKEN=$CLOUDFLARE_TOKEN DNS_PROVIDER_TOKEN=$CLOUDFLARE_TOKEN
DNS_PROVIDER_TYPE=CLOUDFLARE DNS_PROVIDER_TYPE=CLOUDFLARE
DOMAIN=$DOMAIN DOMAIN=$DOMAIN
@ -43,7 +43,7 @@ steps:
LUSER=cicdcicd LUSER=cicdcicd
NIXOS_CONFIG_ID=default NIXOS_CONFIG_ID=default
NIX_VERSION=2.18.1 NIX_VERSION=2.18.1
PROVIDER=hetzner PROVIDER=HETZNER
SSH_AUTHORIZED_KEY="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBb3yVhYF4slhf1iQCiGLOVcbGKP/MmkQiEMl2un+4K" SSH_AUTHORIZED_KEY="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBb3yVhYF4slhf1iQCiGLOVcbGKP/MmkQiEMl2un+4K"
STAGING_ACME=true STAGING_ACME=true

8
nixos-infect
View File

@ -44,10 +44,10 @@ determine2ndDisk() {
volDevPath="$VOLUME_DEV_PATH" volDevPath="$VOLUME_DEV_PATH"
else else
case "$PROVIDER" in case "$PROVIDER" in
hetzner) HETZNER)
volDevPath="/dev/sdb" volDevPath="/dev/sdb"
;; ;;
digitalocean) DIGITALOCEAN)
volDevPath="/dev/sda" volDevPath="/dev/sda"
;; ;;
*) *)
@ -165,7 +165,7 @@ EOF
# FIXME it's questionable whether these modules are needed at all... # FIXME it's questionable whether these modules are needed at all...
declare -a availableKernelModules=() declare -a availableKernelModules=()
[ "$PROVIDER" == "digitalocean" ] \ [ "$PROVIDER" == "DIGITALOCEAN" ] \
&& availableKernelModules+=('"ata_piix"' '"uhci_hcd"' '"xen_blkfront"') && availableKernelModules+=('"ata_piix"' '"uhci_hcd"' '"xen_blkfront"')
[ "$(uname -m)" == "x86_64" ] \ [ "$(uname -m)" == "x86_64" ] \
@ -531,7 +531,7 @@ shopt -s inherit_errexit
trap 'echo ${LINENO}: "$BASH_COMMAND"; exit 1' ERR trap 'echo ${LINENO}: "$BASH_COMMAND"; exit 1' ERR
# digitalocean requires detailed network config to be generated # digitalocean requires detailed network config to be generated
[ "$PROVIDER" == "digitalocean" ] && DoNetConf="y" [ "$PROVIDER" == "DIGITALOCEAN" ] && DoNetConf="y"
apt update apt update
apt install -y git tar curl whois jq apt install -y git tar curl whois jq