From 122330b290bbf28d0db7463d10aa2926179d0ec9 Mon Sep 17 00:00:00 2001 From: kat Date: Sun, 10 Jul 2022 14:05:38 -0700 Subject: [PATCH] chore: fix terraform state submodule integration --- .gitmodules | 14 +++----------- modules/meta/deploy.nix | 2 -- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitmodules b/.gitmodules index d1bfcc59..0ab56003 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,4 @@ -[submodule "config/trusted"] - path = config/trusted +[submodule "tf"] + path = tf branch = main - url = "ssh://gitea@git.kittywit.ch:62954/kat/nixfiles-trusted.git" -[submodule "config/tf"] - path = config/tf - branch = main - url = "gcrypt::ssh://gitea@git.kittywit.ch:62954/kat/nixfiles-sensitive.git#main" -[submodule "overlay/exprs"] - path = overlay/exprs - branch = main - url = "https://github.com/kittywitch/nixexprs" + url = "gcrypt::ssh://git@github.com:kittywitch/nixfiles-tf.git#main" diff --git a/modules/meta/deploy.nix b/modules/meta/deploy.nix index 8fc75209..c8a67363 100644 --- a/modules/meta/deploy.nix +++ b/modules/meta/deploy.nix @@ -84,7 +84,6 @@ in deps = { select.allProviders = true; enable = true; -/* apply = { doneCommand = '' git -C "${cfg.dataDir}" add -A @@ -92,7 +91,6 @@ in git -C "${cfg.dataDir}" push ''; }; -*/ }; terraform = { version = "1.0";