update README with new json format

README.md

@@ -11,7 +11,8 @@ Example JSON config:
 
 ```json
 {
-    "backblaze": {
+    "backup": {
+        "provider": "BACKBLAZE",
         "accountId": "BACKBLAZE_KEY_ID",
         "accountKey": "BACKBLAZE_ACCOUNT_KEY",
         "bucket": "BACKBLAZE_BUCKET_NAME"
@@ -23,9 +24,13 @@ Example JSON config:
     "bitwarden": {
         "enable": true
     },
-    "cloudflare": {
+    "dns": {
+        "provider": "CLOUDFLARE",
         "apiKey": "CF_TOKEN"
     },
+    "server": {
+        "provider": "HETZNER"
+    },
     "databasePassword": "DB_PASSWORD",
     "domain": "DOMAIN",
     "hashedMasterPassword": "HASHED_PASSWORD",
@@ -64,4 +69,4 @@ Example JSON config:
         }
     ]
 }
-```
+```

configuration.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  url-overlay = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/master.tar.gz";
+  url-overlay = "https://git.selfprivacy.org/houkime/selfprivacy-nix-repo/archive/master.tar.gz";
   nix-overlay = (import (builtins.fetchTarball url-overlay));
 in
 {

files.nix

@@ -43,7 +43,7 @@ in
         echo 'CF_API_KEY=REPLACEME' > /var/lib/cloudflare/Credentials.ini
         echo 'CLOUDFLARE_DNS_API_TOKEN=REPLACEME' >> /var/lib/cloudflare/Credentials.ini
         echo 'CLOUDFLARE_ZONE_API_TOKEN=REPLACEME' >> /var/lib/cloudflare/Credentials.ini
-        ${sed} -i "s/REPLACEME/$(cat /etc/nixos/userdata/userdata.json | ${jq} -r '.cloudflare.apiKey')/g" /var/lib/cloudflare/Credentials.ini
+        ${sed} -i "s/REPLACEME/$(cat /etc/nixos/userdata/userdata.json | ${jq} -r '.dns.apiKey')/g" /var/lib/cloudflare/Credentials.ini
         chmod 0440 /var/lib/cloudflare/Credentials.ini
         chown nginx:acmerecievers /var/lib/cloudflare/Credentials.ini
       '';
@@ -56,8 +56,8 @@ in
         echo 'account = REPLACEME1' >> /root/.config/rclone/rclone.conf
         echo 'key = REPLACEME2' >> /root/.config/rclone/rclone.conf
 
-        ${sed} -i "s/REPLACEME1/$(cat /etc/nixos/userdata/userdata.json | ${jq} -r '.backblaze.accountId')/g" /root/.config/rclone/rclone.conf
+        ${sed} -i "s/REPLACEME1/$(cat /etc/nixos/userdata/userdata.json | ${jq} -r '.backup.accountId')/g" /root/.config/rclone/rclone.conf
-        ${sed} -i "s/REPLACEME2/$(cat /etc/nixos/userdata/userdata.json | ${jq} -r '.backblaze.accountKey')/g" /root/.config/rclone/rclone.conf
+        ${sed} -i "s/REPLACEME2/$(cat /etc/nixos/userdata/userdata.json | ${jq} -r '.backup.accountKey')/g" /root/.config/rclone/rclone.conf
 
         chmod 0400 /root/.config/rclone/rclone.conf
         chown root:root /root/.config/rclone/rclone.conf

letsencrypt/acme.nix

@@ -14,7 +14,7 @@ in
         domain = "*.${cfg.domain}";
         extraDomainNames = [ "${cfg.domain}" ];
         group = "acmerecievers";
-        dnsProvider = "cloudflare";
+        dnsProvider = if cfg.dns.provider == "CLOUDFLARE" then "cloudflare" else abort "unknown DNS provider ${cfg.dns.provider}";
         credentialsFile = "/var/lib/cloudflare/Credentials.ini";
       };
       "meet.${cfg.domain}" = {

variables-module.nix

@@ -63,6 +63,16 @@ in
       type = types.nullOr (types.listOf types.str);
       default = [ ];
     };
+    dns = {
+      provider = mkOption {
+        description = "DNS provider that was defined at the initial setup process. Default is ClOUDFLARE";
+        type = types.nullOr types.str;
+      };
+      apiKey = mkOption {
+        description = "A key to DNS provider's API, used for setting up domain and SSL";
+        type = types.nullOr types.str;
+      };
+    };
     ###############
     # API options #
     ###############

variables.nix

@@ -18,6 +18,10 @@ in
       enableSwagger = lib.attrsets.attrByPath [ "api" "enableSwagger" ] false jsonData;
       skippedMigrations = lib.attrsets.attrByPath [ "api" "skippedMigrations" ] [ ] jsonData;
     };
+    dns = {
+      provider = lib.attrsets.attrByPath["dns" "provider"] "" jsonData;
+      apiKey = lib.attrsets.attrByPath["dns" "apiKey"] "" jsonData;
+    };
     backblaze = {
       bucket = lib.attrsets.attrByPath [ "backblaze" "bucket" ] "" jsonData;
     };