strip dashes from nixos configs names

This commit is contained in:
Jörg Thalheim 2023-05-14 18:48:19 +02:00
parent fc44473828
commit 8ba9c90369
4 changed files with 6 additions and 4 deletions

View File

@ -2,5 +2,7 @@ cut_body_after = "" # don't include text from the PR body in the merge commit me
status = [ status = [
"Evaluate flake.nix", "Evaluate flake.nix",
"check treefmt [x86_64-linux]", "check treefmt [x86_64-linux]",
"package default [x86_64-linux]" "package default [x86_64-linux]",
"nixosConfig nixos-wiki-thalheim-io",
"nixosConfig staging-nixos-wiki-thalheim-io",
] ]

View File

@ -8,7 +8,7 @@ in
(builtins.map (builtins.map
(name: (name:
lib.nameValuePair lib.nameValuePair
name (builtins.replaceStrings [ "." ] [ "-" ] name)
(lib.nixosSystem { (lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
# Make flake available in modules # Make flake available in modules

View File

@ -13,7 +13,7 @@ module "wiki" {
source = "../../terraform/nixos-wiki" source = "../../terraform/nixos-wiki"
netlify_dns_zone = "nixos-wiki.thalheim.io" netlify_dns_zone = "nixos-wiki.thalheim.io"
domain = "nixos-wiki.thalheim.io" domain = "nixos-wiki.thalheim.io"
nixos_flake_attr = "nixos-wiki-production" nixos_flake_attr = "nixos-wiki-thalheim-io"
nixos_vars_file = "${path.module}/nixos-vars.json" nixos_vars_file = "${path.module}/nixos-vars.json"
tags = { tags = {
Terraform = "true" Terraform = "true"

View File

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