Compare commits

...

117 Commits

Author SHA1 Message Date
Illia Chub b76fdd3005 Update 'nixos-infect'
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
2022-02-15 11:00:30 +02:00
Illia Chub 8adcf27d18 Encoded Passwords Handling
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
2022-02-11 08:47:02 +02:00
Illia Chub c02c8fbe72 Added Bitwarden test suite
continuous-integration/drone/push Build is passing Details
2022-02-02 08:28:51 +02:00
Illia Chub e439562462 Update '.drone.yml'
continuous-integration/drone/push Build is passing Details
2022-01-21 09:25:29 +02:00
Illia Chub b61ad456f6 Update '.drone.yml'
continuous-integration/drone/push Build is passing Details
2022-01-21 09:08:27 +02:00
Illia Chub 3548e1473e Notification test
continuous-integration/drone/push Build is passing Details
2022-01-21 08:57:52 +02:00
Illia Chub 1cd22c943b Update '.drone.yml'
continuous-integration/drone/push Build is passing Details
2022-01-21 07:56:15 +02:00
Illia Chub b174f4cc36 Update '.drone.yml' 2022-01-21 07:55:22 +02:00
Illia Chub 22bd9a6e57 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 07:44:45 +02:00
Illia Chub b5af3f16d9 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 07:43:23 +02:00
Illia Chub 29635d474a Update '.drone.yml'
continuous-integration/drone/push Build is failing Details
2022-01-21 07:31:24 +02:00
Illia Chub 2a054b26ad Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 07:30:42 +02:00
Illia Chub 06dce44f2e Update '.drone.yml'
continuous-integration/drone/push Build is failing Details
2022-01-21 07:30:12 +02:00
Illia Chub 5253bb604c Update '.drone.yml'
continuous-integration/drone/push Build is passing Details
2022-01-21 07:20:14 +02:00
Illia Chub 7be5ccca83 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 07:19:06 +02:00
Illia Chub d94697cc7f Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 07:12:35 +02:00
Illia Chub 9138650e4a Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 07:06:38 +02:00
Illia Chub 3b175bf3ef Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 06:59:58 +02:00
Illia Chub 8551203e69 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 06:57:15 +02:00
Illia Chub c90fab97b9 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-21 06:53:19 +02:00
Illia Chub b55bad39d6 Send notification only to repo owner
continuous-integration/drone/push Build was killed Details
2022-01-21 06:52:09 +02:00
Illia Chub b0df04ee17 Added alert mail template
continuous-integration/drone/push Build was killed Details
2022-01-21 06:50:28 +02:00
Illia Chub 04892a04d0 Update '.drone.yml'
continuous-integration/drone/push Build is failing Details
2022-01-20 22:40:35 +02:00
Illia Chub aa9b9e68c2 Update '.drone.yml'
continuous-integration/drone/push Build is failing Details
2022-01-20 08:06:34 +02:00
Illia Chub 08ce3129ce Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 08:05:55 +02:00
Illia Chub d6ac4050b0 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 07:59:37 +02:00
Illia Chub 3edd4133cd Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 07:35:57 +02:00
Illia Chub 4a0358b354 Update '.drone.yml'
continuous-integration/drone/push Build is failing Details
2022-01-20 07:24:11 +02:00
Illia Chub 99bb3581a1 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 07:18:55 +02:00
Illia Chub 05fccf332c Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 07:18:20 +02:00
Illia Chub 44990f3e43 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 07:16:03 +02:00
Illia Chub 30f97eb2d6 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 07:11:10 +02:00
Illia Chub f81a5acc52 Update '.drone.yml'
continuous-integration/drone/push Build was killed Details
2022-01-20 07:09:55 +02:00
Illia Chub a8fd42f1ca Update '.drone.yml'
continuous-integration/drone/push Build is failing Details
2022-01-19 23:17:12 +02:00
Illia Chub 0fa14657f4 Update '.drone.yml'
continuous-integration/drone/push Build is failing Details
2022-01-19 23:15:59 +02:00
Illia Chub f43eda8420 Update '.drone.yml'
continuous-integration/drone/push Build encountered an error Details
2022-01-19 22:58:37 +02:00
Illia Chub e633b3daa4 Update '.drone.yml'
continuous-integration/drone/push Build is passing Details
2022-01-18 08:25:21 +02:00
Illia Chub ff2114327a Fixed dependency identation
continuous-integration/drone/push Build is passing Details
2022-01-18 08:24:32 +02:00
Illia Chub 5be89f70f7 Resolved dependency issues
continuous-integration/drone/push Build is passing Details
2022-01-17 09:32:08 +02:00
Illia Chub 05472d67fe Added recipient e-mail
continuous-integration/drone/push Build is passing Details
2022-01-17 09:28:01 +02:00
Illia Chub ffd5be6d10 Added notification capability
continuous-integration/drone/push Build is passing Details
2022-01-17 09:11:29 +02:00
Illia Chub ae4d97a160 Fixed reception e-mail address(temporary solution)
continuous-integration/drone/push Build is passing Details
2022-01-17 07:00:27 +02:00
Illia Chub e8f77e8230 Added pipeline status badge
continuous-integration/drone/push Build is failing Details
2022-01-17 06:49:47 +02:00
Illia Chub ff5ef96e16 Fixed mailserver test configuration
continuous-integration/drone/push Build is failing Details
2022-01-12 10:37:00 +02:00
Illia Chub 9907911e48 Added server teardown phase
continuous-integration/drone/push Build is failing Details
2022-01-12 07:22:10 +02:00
Illia Chub 2329706eb7 Added server teardown phase
continuous-integration/drone/push Build encountered an error Details
2022-01-12 07:20:27 +02:00
Illia Chub 727f4b655d Added server teardown phase
continuous-integration/drone/push Build encountered an error Details
2022-01-12 07:17:42 +02:00
Illia Chub 715b230566 Added server teardown phase
continuous-integration/drone/push Build encountered an error Details
2022-01-12 07:16:15 +02:00
Illia Chub 48af87d2ba Added server teardown phase
continuous-integration/drone/push Build encountered an error Details
2022-01-12 07:13:51 +02:00
Illia Chub 64146267ea Added server teardown phase
continuous-integration/drone/push Build encountered an error Details
2022-01-12 07:06:16 +02:00
Illia Chub 03505572fb Silenced DNS record creation request
continuous-integration/drone/push Build is failing Details
2022-01-11 16:07:03 +02:00
Illia Chub fa0598950f PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 16:01:23 +02:00
Illia Chub 74c6d11eac PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:47:06 +02:00
Illia Chub 14a1a85389 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:40:01 +02:00
Illia Chub 5cfca5effe PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:37:56 +02:00
Illia Chub 2f99dfa027 PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 15:36:23 +02:00
Illia Chub 09e76270c4 PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 15:33:25 +02:00
Illia Chub d34fb3901c PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 15:31:25 +02:00
Illia Chub 98ba76a9da PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 15:29:34 +02:00
Illia Chub 5233ec37bd PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:23:24 +02:00
Illia Chub 8250af161b PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:18:39 +02:00
Illia Chub f2861b20b0 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:12:33 +02:00
Illia Chub b28820ed4a PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:11:24 +02:00
Illia Chub 16fb313850 PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 15:04:54 +02:00
Illia Chub 886db14f26 PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 15:04:09 +02:00
Illia Chub e541fa7882 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:03:30 +02:00
Illia Chub 0a1aec1353 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:02:13 +02:00
Illia Chub c943276095 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 15:00:12 +02:00
Illia Chub 745aa41d13 PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 14:58:54 +02:00
Illia Chub cfedf9d1f0 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 14:57:36 +02:00
Illia Chub bc81227c6e PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 14:55:47 +02:00
Illia Chub b71926d9b8 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 10:17:55 +02:00
Illia Chub c81b40744c PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 10:15:47 +02:00
Illia Chub fc7a83d9a0 PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 10:15:00 +02:00
Illia Chub 2100dbf786 PoC: Special character escape attempt
continuous-integration/drone/push Build was killed Details
2022-01-11 10:14:22 +02:00
Illia Chub 2f282b1fd0 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 10:08:25 +02:00
Illia Chub f92bd30c74 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 10:05:32 +02:00
Illia Chub 8085028ca6 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 10:02:14 +02:00
Illia Chub 58d5f6e30b PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 10:00:20 +02:00
Illia Chub 56060ca64c PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 09:59:21 +02:00
Illia Chub 676bbf8522 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 09:53:07 +02:00
Illia Chub 4150b09c83 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 09:49:37 +02:00
Illia Chub 1769da3477 PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 08:10:26 +02:00
Illia Chub 27129d77dd PoC: Special character escape attempt
continuous-integration/drone/push Build is failing Details
2022-01-11 08:09:27 +02:00
Illia Chub cf05b9e756 Fixed server naming reference
continuous-integration/drone/push Build is failing Details
2022-01-11 08:03:39 +02:00
Illia Chub 4d9bcb1b2c Fixed server naming reference
continuous-integration/drone/push Build is failing Details
2022-01-11 07:59:24 +02:00
Illia Chub 21ba8e0f4b Fixed server naming reference
continuous-integration/drone/push Build is failing Details
2022-01-11 07:57:06 +02:00
Illia Chub 9d8bf3357e PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:53:48 +02:00
Illia Chub 5d7c2c917b PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:50:59 +02:00
Illia Chub 4bd2ff6919 PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:46:57 +02:00
Illia Chub b4a9bea8b3 PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:44:26 +02:00
Illia Chub 2dc9c5606e PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:39:48 +02:00
Illia Chub 4e53e9364e PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:37:02 +02:00
Illia Chub da430c2d0f PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:34:04 +02:00
Illia Chub 362e0bbdd1 PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:31:39 +02:00
Illia Chub 4df49c2f1d PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:27:10 +02:00
Illia Chub 14b5ae7bda PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:26:12 +02:00
Illia Chub eb49799433 PoC: Alternative envvar definition
continuous-integration/drone/push Build is failing Details
2022-01-11 07:23:42 +02:00
Illia Chub 0789958a04 Fixed identation
continuous-integration/drone/push Build is failing Details
2022-01-11 07:19:06 +02:00
Illia Chub 4f9541e3cb Fixed identation
continuous-integration/drone/push Build is failing Details
2022-01-11 07:10:22 +02:00
Illia Chub 5b8b71c33a Resolved VM creation process
continuous-integration/drone/push Build is failing Details
2022-01-11 07:00:53 +02:00
Illia Chub 617bbbf430
Added DNS propagation stage
continuous-integration/drone/push Build is failing Details
2021-12-23 10:33:50 +02:00
Illia Chub 38a86a69bb
Fixed hostname in CI/CD pipeline
continuous-integration/drone/push Build is failing Details
2021-12-23 09:48:33 +02:00
Illia Chub f727f1a07e
Added mail sending tests and NextCloud feature tests
continuous-integration/drone/push Build is failing Details
2021-12-23 09:38:50 +02:00
Illia Chub adcab4b713 Fixed JSON identation
continuous-integration/drone/push Build is passing Details
2021-12-22 08:21:49 +02:00
Illia Chub 148ed9b3af Fixed JSON identation
continuous-integration/drone/push Build is passing Details
2021-12-22 08:17:26 +02:00
Illia Chub 7bc0760493 Added tests execution after server deploy
continuous-integration/drone/push Build is passing Details
2021-12-22 08:16:02 +02:00
Illia Chub c6e2202d3a Fixed invalid JSON fields
continuous-integration/drone/push Build is passing Details
2021-12-22 07:59:11 +02:00
Illia Chub d6d6f49a3a Changed secret substitution method
continuous-integration/drone/push Build is passing Details
2021-12-22 07:50:19 +02:00
Illia Chub 2bfe29188f Changed secret variable name
continuous-integration/drone/push Build is passing Details
2021-12-22 07:45:39 +02:00
Illia Chub c15551d421 Changed secret substitution method
continuous-integration/drone/push Build is passing Details
2021-12-22 07:44:58 +02:00
Illia Chub 1fc7d4d359 Fixed JSON serialization issues
continuous-integration/drone/push Build is passing Details
2021-12-22 07:44:11 +02:00
Illia Chub ae4524ffe8 Removed unnecessary escape characters
continuous-integration/drone/push Build is passing Details
2021-12-22 07:41:51 +02:00
Illia Chub f6bf56fd41 Added missing Hetzner API endpoint URL
continuous-integration/drone/push Build is failing Details
2021-12-22 07:40:24 +02:00
Illia Chub 3188b8ff5e Merge branch 'development' of git.selfprivacy.org:SelfPrivacy/selfprivacy-nixos-infect into development
continuous-integration/drone/push Build is failing Details
2021-12-22 07:38:11 +02:00
Illia Chub 3a01055772 Added Drone CI integration 2021-12-22 07:37:15 +02:00
Illia Chub eaac956e64 Merge pull request 'Merge rolling branch into development' (#21) from rolling into development
Reviewed-on: #21
2021-11-22 12:45:26 +02:00
3 changed files with 109 additions and 1 deletions

102
.drone.yml Normal file
View File

@ -0,0 +1,102 @@
kind: pipeline
type: exec
name: default
steps:
- name: deploy
environment:
PASSWORD:
from_secret: HETZNER_TOKEN
DOMAIN:
from_secret: DOMAIN
commands:
- >
curl -X POST
-H "Authorization: Bearer $PASSWORD"
-H "Content-Type: application/json"
-d '{"name":"ci-sibling","server_type":"cx11","start_after_create":true,"image":"ubuntu-20.04", "volumes":[], "networks":[], "user_data":"#cloud-config\\nruncmd:\\n- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/rolling-testing/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-21.05 DOMAIN=ruleit.stream LUSER=cicdcicd PASSWORD=cicdcicdpass CF_TOKEN=228337 DB_PASSWORD=228337 API_TOKEN=228337 HOSTNAME=ruleit.stream bash 2>&1 | tee /tmp/infect.log","labels":{},"automount":false, "location":"fsn1"}'
'https://api.hetzner.cloud/v1/servers'
- name: dns
environment:
PASSWORD:
from_secret: HETZNER_TOKEN
CLOUDFLARE_TOKEN:
from_secret: CLOUDFLARE_TOKEN
DOMAIN: ruleit.stream
ZONE_ID:
from_secret: ZONE_ID
commands:
- >
curl -s -H "Authorization: Bearer $PASSWORD" 'https://api.hetzner.cloud/v1/servers' > .machine.json
- >
export machineip=$( for i in {0..24}; do jq 'if .servers['$i'].name == "ci-sibling" then .servers['$i'].public_net.ipv4.ip else null end' .machine.json; done | grep -v null | sed 's/"//' | sed 's/"//' )
- echo $machineip
- >
curl -s -X GET "https://api.cloudflare.com/client/v4/zones?name=$DOMAIN"
-H "Authorization: Bearer $CLOUDFLARE_TOKEN"
-H "Content-Type: application/json"
- >
curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$ZONE_ID/dns_records"
-H "Authorization: Bearer $CLOUDFLARE_TOKEN"
-H "Content-Type: application/json"
--data '{"type":"A","name":"@","content":"'"$$machineip"'","ttl":3600,"priority":10,"proxied":false}'
- >
curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$ZONE_ID/dns_records"
-H "Authorization: Bearer $CLOUDFLARE_TOKEN"
-H "Content-Type: application/json"
--data '{"type":"MX","name":"@","content":"'"$$DOMAIN"'","ttl":3600,"priority":10,"proxied":false}'
- >
curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$ZONE_ID/dns_records"
-H "Authorization: Bearer $CLOUDFLARE_TOKEN"
-H "Content-Type: application/json"
--data '{"type":"TXT","name":"_dmarc","content":"v=DMARC1; p=none","ttl":18000,"priority":10,"proxied":false}'
- >
curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$ZONE_ID/dns_records"
-H "Authorization: Bearer $CLOUDFLARE_TOKEN"
-H "Content-Type: application/json"
--data '{"type":"TXT","name":"'"$$DOMAIN"'","content":"v=spf1 a mx ip4:"$$machineip" -all","ttl":18000,"priority":10,"proxied":false}'
- name: sleep
commands:
- sleep 360
- name: test
commands:
- >
curl -H "Authorization: Bearer 228337" 'https://api.ruleit.stream/services/status'
- >
swaks --to ci@ruleit.stream -s selfprivacy.org -tls -au test@selfprivacy.org -ap 228337
- >
curl --user admin:228337 https://cloud.ruleit.stream/ocs/v2.php/apps/serverinfo/api/v1/info?format=json
- echo "blah-blah" > file
- >
curl -T file -u admin:228337 https://cloud.ruleit.stream/remote.php/dav/files/admin/file
- >
curl -u admin:228337 https://cloud.ruleit.stream/remote.php/dav/files/admin/file
- >
curl https://password.ruleit.stream/admin/diagnostics
- name: teardown
environment:
PASSWORD:
from_secret: HETZNER_TOKEN
CLOUDFLARE_TOKEN:
from_secret: CLOUDFLARE_TOKEN
DOMAIN: ruleit.stream
ZONE_ID:
from_secret: ZONE_ID
commands:
- >
curl -s "https://api.hetzner.cloud/v1/servers"
-H "Authorization: Bearer $PASSWORD" > .hetzner_servers.json
- export machineid=$( for i in {0..24}; do jq 'if .servers['$i'].name == "ci-sibling" then .servers['$i'].id else null end' .hetzner_servers.json; done | grep -v null | sed 's/"//g')
- >
curl -s -X DELETE "https://api.hetzner.cloud/v1/servers/$machineid"
-H "Authorization: Bearer $PASSWORD"
- name: notify
commands:
- docker run --rm -e PLUGIN_FROM_ADDRESS=test@selfprivacy.org -e PLUGIN_FROM_NAME="SelfPrivacy CI" -e PLUGIN_HOST=selfprivacy.org -e PLUGIN_USERNAME=test@selfprivacy.org -e PLUGIN_PASSWORD=228337 -e DRONE_REPO_OWNER=SelfPrivacy -e DRONE_REPO_NAME=selfprivacy-nixos-infect -e DRONE_COMMIT_BRANCH=development -e DRONE_COMMIT_AUTHOR_EMAIL=illia.chub@selfprivacy.org -v /etc/recipients:/etc/recipients -w $(pwd) drillster/drone-email

View File

@ -1,3 +1,5 @@
[![Build Status](https://ci.selfprivacy.org/api/badges/SelfPrivacy/selfprivacy-nixos-infect/status.svg?ref=refs/heads/development)](https://ci.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect)
This script - is a modded version of original [nixos-infect](https://github.com/elitak/nixos-infect). It have been revritten to suit needs of SelfPrivacy project. Except transforming your Ubuntu Linux system into NixOS GNU/Linux, it deploys standart services that SelfPrivacy offers to their customers.
## Source Distros

View File

@ -8,6 +8,10 @@ makeConf() {
# Skip everything if main config already present
[[ -e /etc/nixos/configuration.nix ]] && return 0
# NB <<"EOF" quotes / $ ` in heredocs, <<EOF does not
if [[ $PASSWORD == null ]]; then
export PASSWORD=$(printf $ENCODED_PASSWORD | base64 --decode | jq -Rs .)
mkdir -p /etc/nixos
git clone https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git /etc/nixos
@ -338,7 +342,7 @@ infect() {
[ "$PROVIDER" = "digitalocean" ] && doNetConf=y # digitalocean requires detailed network config to be generated
apt update
apt install git tar wget curl
apt install git tar wget curl jq
checkEnv
prepareEnv
makeSwap # smallest (512MB) droplet needs extra memory!