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

fix: Import networking.nix when on Digital ocean

testing/digital-ocean
Inex Code 2022-11-08 01:37:28 +03:00
parent eca6780983
commit 7af1730fa3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos-infect
View File

@ -27,6 +27,7 @@ makeConf() {
&& break && break
done done
local network_import="" local network_import=""
[[ -n "$doNetConf" ]] && network_import="./networking.nix # generated at runtime by nixos-infect"
cat > /etc/nixos/userdata/userdata.json << EOF cat > /etc/nixos/userdata/userdata.json << EOF
{ {
@ -34,7 +35,8 @@ makeConf() {
"token": "$API_TOKEN", "token": "$API_TOKEN",
"skippedMigrations": ["migrate_to_selfprivacy_channel", "mount_volume"] "skippedMigrations": ["migrate_to_selfprivacy_channel", "mount_volume"]
}, },
"backblaze": { "backup": {
"provider": "BACKBLAZE",
"accountId": "$BACKBLAZE_KEY_ID", "accountId": "$BACKBLAZE_KEY_ID",
"accountKey": "$BACKBLAZE_ACCOUNT_KEY", "accountKey": "$BACKBLAZE_ACCOUNT_KEY",
"bucket": "$BACKBLAZE_BUCKET_NAME" "bucket": "$BACKBLAZE_BUCKET_NAME"
@ -43,9 +45,13 @@ makeConf() {
"enable": true, "enable": true,
"location": "sdb" "location": "sdb"
}, },
"cloudflare": { "dns": {
"provider": "CLOUDFLARE",
"apiKey": "$CF_TOKEN" "apiKey": "$CF_TOKEN"
}, },
"server": {
"provider": "DIGITALOCEAN",
},
"databasePassword": "$DB_PASSWORD", "databasePassword": "$DB_PASSWORD",
"domain": "$DOMAIN", "domain": "$DOMAIN",
"hashedMasterPassword": "$HASHED_PASSWORD", "hashedMasterPassword": "$HASHED_PASSWORD",
@ -106,7 +112,10 @@ EOF
cat > /etc/nixos/hardware-configuration.nix << EOF cat > /etc/nixos/hardware-configuration.nix << EOF
{ modulesPath, ... }: { modulesPath, ... }:
{ {
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; imports = [
(modulesPath + "/profiles/qemu-guest.nix")
$network_import
];
$bootcfg $bootcfg
boot.initrd.kernelModules = [ "nvme" ]; boot.initrd.kernelModules = [ "nvme" ];
fileSystems."/" = { device = "$rootfsdev"; fsType = "$rootfstype"; }; fileSystems."/" = { device = "$rootfsdev"; fsType = "$rootfstype"; };