From fc63aaf7190a7a28a1673edea281fa7d26487492 Mon Sep 17 00:00:00 2001
From: garionion <github@entr0py.de>
Date: Mon, 12 Apr 2021 14:03:26 +0200
Subject: [PATCH] minor improvements

---
 hosts/dyon/configuration.nix | 2 +-
 hosts/kaon/monitoring.nix    | 2 +-
 hosts/nebula/drone.nix       | 8 ++++----
 hosts/pion/wireguard.nix     | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hosts/dyon/configuration.nix b/hosts/dyon/configuration.nix
index 6338338..bff1190 100644
--- a/hosts/dyon/configuration.nix
+++ b/hosts/dyon/configuration.nix
@@ -26,7 +26,7 @@
 
   clerie.monitoring = {
     enable = true;
-    id = "201";
+    id = "35";
     privKeyFile = "/run/keys/wg-dyon_priv";
     pubkey = "4faakn5yfzukxRwo79iTawag4jzAFkErXHLeEvtoLCc=";
   };
diff --git a/hosts/kaon/monitoring.nix b/hosts/kaon/monitoring.nix
index e1af069..9b1a8a8 100644
--- a/hosts/kaon/monitoring.nix
+++ b/hosts/kaon/monitoring.nix
@@ -55,7 +55,7 @@ in {
         static_configs = [
           {
             targets = [
-              "monitoring-1.mon.entr0py.de:9090"
+              "[::1]:9090"
             ];
           }
         ];
diff --git a/hosts/nebula/drone.nix b/hosts/nebula/drone.nix
index 41642ef..c890ffa 100644
--- a/hosts/nebula/drone.nix
+++ b/hosts/nebula/drone.nix
@@ -42,11 +42,11 @@
             environment = {
                 /*DRONE_DATABASE_DRIVER="postgres";
                 DRONE_DATABASE_DATASOURCE="postgresql:///drone?host=/run/postgresql";*/
-                DRONE_DATABASE_SECRET= toString ./drone_database.secret;
+                DRONE_DATABASE_SECRET= (builtins.readFile ./drone_database.secret);
                 DRONE_GITEA_SERVER="https://git.entr0py.de";
                 DRONE_GITEA_CLIENT_ID="07f3c25c-4f9d-4642-afcf-c419976cfaac";
-                DRONE_GITEA_CLIENT_SECRET= toString ./gitea_client.secret;
-                DRONE_RPC_SECRET= toString ./drone_rpc.secret;
+                DRONE_GITEA_CLIENT_SECRET= (builtins.readFile ./gitea_client.secret);
+                DRONE_RPC_SECRET= (builtins.readFile ./drone_rpc.secret);
                 DRONE_SERVER_HOST="drone.entr0py.de";
                 DRONE_SERVER_PROTO="https";
                 DRONE_USER_CREATE="username:garionion,admin:true";
@@ -63,7 +63,7 @@
             dependsOn = [ "drone-server" ];
             image = "drone/drone-runner-docker:1";
             environment = {
-                DRONE_RPC_SECRET= toString ./drone_rpc.secret;
+                DRONE_RPC_SECRET= (builtins.readFile ./drone_rpc.secret);
                 DRONE_RPC_PROTO="https";
                 DRONE_RPC_HOST="drone.entr0py.de";
                 DRONE_RUNNER_CAPACITY="4";
diff --git a/hosts/pion/wireguard.nix b/hosts/pion/wireguard.nix
index e38045a..3a82d7a 100644
--- a/hosts/pion/wireguard.nix
+++ b/hosts/pion/wireguard.nix
@@ -25,7 +25,6 @@
                 peers = [{
                     publicKey = "bgWFMIasw+IHfr/1drJWEHBcsCZ3fqoB4djiZ9BDUCM=";
                     allowedIPs = [ "2a03:4000:20:18e::/64" "fd33:ab07:f877:23:300::1/72" ];
-                    endpoint = "usg.net.entr0py.de:52820";
                     persistentKeepalive = 25;
                 }];
             };