From 8f7963368d5926c4887e09c3cd2d92a6a06f6a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 5 Jul 2023 11:13:05 +0200 Subject: [PATCH] apply treefmt --- modules/web01/default.nix | 2 +- modules/web01/gitea.nix | 2 +- modules/web01/homepage.nix | 4 ++-- targets/admins/terraform.tf | 2 +- targets/web01/configuration.nix | 6 ++++-- terraform/web01/dns.tf | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/web01/default.nix b/modules/web01/default.nix index d894a59..4e4f36d 100644 --- a/modules/web01/default.nix +++ b/modules/web01/default.nix @@ -1,4 +1,4 @@ -{ +{ imports = [ ./homepage.nix ./gitea.nix diff --git a/modules/web01/gitea.nix b/modules/web01/gitea.nix index 3e134c0..fdbc613 100644 --- a/modules/web01/gitea.nix +++ b/modules/web01/gitea.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql_14; diff --git a/modules/web01/homepage.nix b/modules/web01/homepage.nix index 613f301..5c025ba 100644 --- a/modules/web01/homepage.nix +++ b/modules/web01/homepage.nix @@ -1,4 +1,4 @@ -{ pkgs, ...}: { +{ pkgs, ... }: { security.acme.defaults.email = "admins@clan.lol"; security.acme.acceptTerms = true; @@ -6,7 +6,7 @@ virtualHosts."clan.lol" = { forceSSL = true; enableACME = true; - root = pkgs.runCommand "clan.lol" {} '' + root = pkgs.runCommand "clan.lol" { } '' mkdir -p $out; cat > $out/index.html < diff --git a/targets/admins/terraform.tf b/targets/admins/terraform.tf index 1f2e7ee..b1cb2f7 100644 --- a/targets/admins/terraform.tf +++ b/targets/admins/terraform.tf @@ -6,7 +6,7 @@ terraform { module "admin" { source = "../../terraform/admins" ssh_keys = { - mic92 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine" + mic92 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine" lassulus = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIb3uuMqE/xSJ7WL/XpJ6QOj4aSmh0Ga+GtmJl3CDvljGuIeGCKh7YAoqZAi051k5j6ZWowDrcWYHIOU+h0eZCesgCf+CvunlXeUz6XShVMjyZo87f2JPs2Hpb+u/ieLx4wGQvo/Zw89pOly/vqpaX9ZwyIR+U81IAVrHIhqmrTitp+2FwggtaY4FtD6WIyf1hPtrrDecX8iDhnHHuGhATr8etMLwdwQ2kIBx5BBgCoiuW7wXnLUBBVYeO3II957XP/yU82c+DjSVJtejODmRAM/3rk+B7pdF5ShRVVFyB6JJR+Qd1g8iSH+2QXLUy3NM2LN5u5p2oTjUOzoEPWZo7lykZzmIWd/5hjTW9YiHC+A8xsCxQqs87D9HK9hLA6udZ6CGkq4hG/6wFwNjSMnv30IcHZzx6IBihNGbrisrJhLxEiKWpMKYgeemhIirefXA6UxVfiwHg3gJ8BlEBsj0tl/HVARifR2y336YINEn8AsHGhwrPTBFOnBTmfA/VnP1NlWHzXCfVimP6YVvdoGCCnAwvFuJ+ZuxmZ3UzBb2TenZZOzwzV0sUzZk0D1CaSBFJUU3oZNOkDIM6z5lIZgzsyKwb38S8Vs3HYE+Dqpkfsl4yeU5ldc6DwrlVwuSIa4vVus4eWD3gDGFrx98yaqOx17pc4CC9KXk/2TjtJY5xmQ==" } } diff --git a/targets/web01/configuration.nix b/targets/web01/configuration.nix index 6765b72..5052165 100644 --- a/targets/web01/configuration.nix +++ b/targets/web01/configuration.nix @@ -1,6 +1,8 @@ -{ self, ... }: let +{ self, ... }: +let nixosVars = builtins.fromJSON (builtins.readFile ./nixos-vars.json); -in { +in +{ imports = [ self.nixosModules.web01 self.nixosModules.hcloud diff --git a/terraform/web01/dns.tf b/terraform/web01/dns.tf index 66020fe..c7496e7 100644 --- a/terraform/web01/dns.tf +++ b/terraform/web01/dns.tf @@ -16,7 +16,7 @@ resource "netlify_dns_record" "server_aaaa" { type = "AAAA" value = hcloud_server.server.ipv6_address } - + resource "netlify_dns_record" "www_a" { zone_id = netlify_dns_zone.server.id hostname = "www.${var.domain}"