From 2c1fd1645b0cfcb07cd987720f82e8b4fa04a572 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Sun, 30 May 2021 19:07:41 +0000
Subject: [PATCH] Some more clean up: Shorten enableVpn
---
morph/lib/make-issuer.nix | 5 ++---
morph/lib/make-monitoring.nix | 7 +++----
morph/lib/make-testing.nix | 5 ++---
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/morph/lib/make-issuer.nix b/morph/lib/make-issuer.nix
index b5573a15..9d60db41 100644
--- a/morph/lib/make-issuer.nix
+++ b/morph/lib/make-issuer.nix
@@ -12,9 +12,8 @@
, ...
}: let
- enableVpn = if (monitoringvpnKeyDir != null &&
- monitoringvpnIPv4 != null)
- then true else false;
+ enableVpn = monitoringvpnKeyDir != null &&
+ monitoringvpnIPv4 != null;
vpnSecrets = if !enableVpn then {} else {
"monitoringvpn-secret-key" = {
diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix
index 370f177e..b65f7249 100644
--- a/morph/lib/make-monitoring.nix
+++ b/morph/lib/make-monitoring.nix
@@ -10,10 +10,9 @@
, vpnClientIPs ? null
, ... }: let
- enableVpn = if (monitoringvpnKeyDir != null &&
- monitoringvpnIPv4 != null &&
- vpnClientIPs != null)
- then true else false;
+ enableVpn = monitoringvpnKeyDir != null &&
+ monitoringvpnIPv4 != null &&
+ vpnClientIPs != null;
vpnSecrets = if !enableVpn then {} else {
"monitoringvpn-private-key" = {
diff --git a/morph/lib/make-testing.nix b/morph/lib/make-testing.nix
index 023c9202..14765fdc 100644
--- a/morph/lib/make-testing.nix
+++ b/morph/lib/make-testing.nix
@@ -9,9 +9,8 @@
, monitoringvpnIPv4 ? null
, ... }: let
- enableVpn = if (monitoringvpnKeyDir != null &&
- monitoringvpnIPv4 != null)
- then true else false;
+ enableVpn = monitoringvpnKeyDir != null &&
+ monitoringvpnIPv4 != null;
vpnSecrets = if !enableVpn then {} else {
"monitoringvpn-secret-key" = {
--
GitLab