simplify directory structure

This commit is contained in:
Jörg Thalheim 2023-05-14 18:43:08 +02:00
parent 820b0071b4
commit fc44473828
22 changed files with 4 additions and 20 deletions

View File

@ -18,8 +18,8 @@
systems = lib.systems.flakeExposed;
imports = [
inputs.treefmt-nix.flakeModule
./terraform/targets/flake-module.nix
./nix/modules/flake-module.nix
./targets/flake-module.nix
./modules/flake-module.nix
];
perSystem = { config, pkgs, ... }: {
treefmt = {

View File

@ -10,7 +10,7 @@ terraform {
}
module "wiki" {
source = "../../modules/wiki"
source = "../../terraform/nixos-wiki"
netlify_dns_zone = "nixos-wiki.thalheim.io"
domain = "nixos-wiki.thalheim.io"
nixos_flake_attr = "nixos-wiki-production"

View File

@ -10,7 +10,7 @@ terraform {
}
module "wiki" {
source = "../../modules/wiki"
source = "../../terraform/nixos-wiki"
netlify_dns_zone = "nixos-wiki.thalheim.io"
nixos_flake_attr = "nixos-wiki-staging"
nixos_vars_file = "${path.module}/nixos-vars.json"

View File

@ -1,16 +0,0 @@
# This file is maintained automatically by "terraform init".
# Manual edits may be lost in future updates.
provider "registry.terraform.io/aegirhealth/netlify" {
version = "0.6.12"
hashes = [
"h1:jorNWhgRCghXD0F6S7urDp1dPeczpFMTGttLeYAdbuo=",
]
}
provider "registry.terraform.io/hetznercloud/hcloud" {
version = "1.38.2"
hashes = [
"h1:RVMJb7bPzN6xrsIpegNBpSlx8pnhowWV9mzsvPFPvRU=",
]
}