Adds a sops grafana password; clean up

input-output-hk · Sep 21, 2020 · e330746 · e330746
1 parent 79a61c1
commit e330746
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 secrets/
 /.terraform
+.direnv/
+cert.config
+config.tf.json
+result/
diff --git a/encrypted/grafana-password.json b/encrypted/grafana-password.json
@@ -0,0 +1,21 @@
+{
+	"data": "ENC[AES256_GCM,data:YqSIp9ybBNS6fUjOXcIlXJ5wS568t5fggW/coh69HKJ9ydhjFmUxmMF6SSzp,iv:yXrE3wCIf0LyqrBgGkK3K3AASqLO5juy9RaKxYg71Ww=,tag:qNhlPcpizCIhas/3GoqrWg==,type:str]",
+	"sops": {
+		"kms": [
+			{
+				"arn": "arn:aws:kms:eu-central-1:166923377823:key/745684e5-272e-49af-aad8-8b073b8d996a",
+				"created_at": "2020-09-21T21:23:12Z",
+				"enc": "AQICAHhrojTK6n26HmYKLb0yBk/ElAVU1hzpU0tO+VpBwhxnTgGXaT6fuX2OZuErY5wG68a4AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM1uwmdMo7I7ZembMVAgEQgDtKlSArBQivXvBkFQ5zyH0N6C2GcO9QEiq5UUSVYddxSwABEXWCkJoxm7j8KSNBUV+qhYflTtiZrC2kAg==",
+				"aws_profile": ""
+			}
+		],
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"lastmodified": "2020-09-21T21:23:12Z",
+		"mac": "ENC[AES256_GCM,data:1/FNr+fjhyFhHVO2mDjHlpgoNIluzetc8jLvH0RoP40u4cox9Ft2gcC6QO/ufQt+X6/Z/tzzoG5goHEap16rjN6su2D5PWN/gpflVhcxwRv2rRm8z6Q6ulmVkThGBD7N3uozl7rhkU7Dg8kHWfD09PPOBch35XBIrk+8vH6z78w=,iv:mxPsqrzaSxK/X07cJlKcmLSO+NEevf1+Cx9sSnJHan8=,tag:8CX0Z9rlhAECUCaaN8CFDA==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.6.0"
+	}
+}
diff --git a/flake.lock b/flake.lock
diff --git a/jobs/mantis.nix b/jobs/mantis.nix
@@ -1,6 +1,6 @@
 { mkNomadJob, systemdSandbox, writeShellScript, writeText, coreutils, lib
-, cacert, jq, gnused, mantis, dnsutils, gnugrep, iproute, lsof, netcat
-, nettools, procps }:
+, cacert, jq, gnused, mantis, dnsutils, gnugrep, iproute, lsof, netcat, nettools
+, procps }:
 let
   nodeConfig = {
     logging = {

diff --git a/overlay.nix b/overlay.nix
@@ -32,6 +32,10 @@ final: prev: {
       final.cfssl
       final.nixfmt
       final.awscli
+      final.nomad
+      final.consul
+      final.consul-template
+      final.python38Packages.pyhcl
     ];
   };
 
@@ -59,5 +63,5 @@ final: prev: {
 
   inherit (self.inputs.bitte.legacyPackages.${system})
     vault-bin mkNomadJob mkNomadTaskSandbox terraform-with-plugins
-    systemdSandbox nixFlakes;
+    systemdSandbox nixFlakes nomad consul consul-template;
 }