diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index feabf83..38c7531 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,3 +15,7 @@ repos: - --allow-multiple-documents - id: detect-private-key - id: trailing-whitespace + - repo: https://github.com/antonbabenko/pre-commit-terraform + rev: v1.86.0 + hooks: + - id: terraform_fmt diff --git a/tofu/adguard/main.tf b/tofu/adguard/main.tf index 254ad0e..f084e93 100644 --- a/tofu/adguard/main.tf +++ b/tofu/adguard/main.tf @@ -7,7 +7,7 @@ terraform { required_providers { adguard = { - source = "gmichels/adguard" + source = "gmichels/adguard" version = "1.1.5" } } @@ -16,7 +16,7 @@ terraform { provider "adguard" { host = "192.168.1.7" username = "admin" - scheme = "http" + scheme = "http" timeout = 5 } diff --git a/tofu/adguard/sample.env b/tofu/adguard/sample.env index cad1a22..32f8e5e 100644 --- a/tofu/adguard/sample.env +++ b/tofu/adguard/sample.env @@ -1 +1 @@ -ADGUARD_PASSWORD=superdupersecret \ No newline at end of file +ADGUARD_PASSWORD=superdupersecret diff --git a/tofu/modules/proxmox-vm/.terraform.lock.hcl b/tofu/modules/proxmox-vm/.terraform.lock.hcl new file mode 100644 index 0000000..24c7397 --- /dev/null +++ b/tofu/modules/proxmox-vm/.terraform.lock.hcl @@ -0,0 +1,24 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/thegameprofi/proxmox" { + version = "2.9.15" + constraints = "2.9.15" + hashes = [ + "h1:PPrRxolUV0bwNvWACdbcW0hVjpOcNQkiPKJJk0kcgoM=", + "zh:1ffee851e14bd23547dcd0b72d19f703eb8b4f76dcce7a2c65d2eaaab0dbd104", + "zh:295f79973e0d3cfe6b5d8cf43d35b88e934137b1333da90dc16076c90b6e2702", + "zh:29fa35ab8b53e02060f0d33dc895a5e866bb02c519d89d32b25d3b6ca7d8617a", + "zh:2a487a9ad855cd09caeda77a31102307bc68c4f19a0715c6ed5504f20c6de9db", + "zh:2a49c0a041a3e9dbc5145c3ae4bee152c62b2533e9062a6c2cca17d4384a76f8", + "zh:3e4fbe4775b1a84fadb96602e514451b1624d772a05f36f06003b202bbb5eed3", + "zh:58f79e7ad576c016dc8bd07ed2c768df7a8559573acd039d6710a15958ebf2af", + "zh:8827bdfb8b75a8b1ce7e1cfebf2005e0a710e45b6c9300abb87e2e70798004b2", + "zh:8a1ca1d3fae360faa15139af1af138363fbf01948f9fdb7fe5e5983ecf63b187", + "zh:a36e0d3503d82d422388a5ac085fb57f7bb537a8a1ed9477113dee6f0e7de94d", + "zh:b46d114574256938e865b0073f385143a085583a07885317ce51965a6c170dbd", + "zh:b7ef63fdccd635d741f76d52c77767cbb9b93027fc7b4fdd968a876909480116", + "zh:ba2721389bb5536ec075845c836cc8684c1d562573f41e484dec7624254d6cf4", + "zh:f4781adf4ee8ceea7b595df6b481c960371413024c3af90a7d9d82bd03e19e60", + ] +} diff --git a/tofu/modules/proxmox-vm/main.tf b/tofu/modules/proxmox-vm/main.tf index c46c905..9e161d4 100644 --- a/tofu/modules/proxmox-vm/main.tf +++ b/tofu/modules/proxmox-vm/main.tf @@ -31,15 +31,15 @@ resource "proxmox_vm_qemu" "vm" { type = "scsi" } network { - bridge = var.network_bridge_name - firewall = false + bridge = var.network_bridge_name + firewall = false link_down = false - model = "virtio" - mtu = 0 - queues = 0 - rate = 0 - tag = -1 + model = "virtio" + mtu = 0 + queues = 0 + rate = 0 + tag = -1 } - sshkeys = var.ssh_keys + sshkeys = var.ssh_keys nameserver = "192.168.1.7 192.168.1.3" } diff --git a/tofu/modules/truenas-vm/.terraform.lock.hcl b/tofu/modules/truenas-vm/.terraform.lock.hcl new file mode 100644 index 0000000..2324926 --- /dev/null +++ b/tofu/modules/truenas-vm/.terraform.lock.hcl @@ -0,0 +1,25 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/dariusbakunas/truenas" { + version = "0.11.1" + constraints = "0.11.1" + hashes = [ + "h1:VZpXqjAwTxQwnSf/rBBcn5ZkcbgtZDkEu6yllNk0yQ0=", + "zh:00170d10b595cfbe78c3b1318c70bffd0a98c87ca25991d6e6d3b675f2e4ffab", + "zh:0fc0761abfc472e29649e3541af31935e0676f2c2e0ad845d1b2f6a0a45165f3", + "zh:146e8c81fd9d1b5d46300f57d06933b7c8eed139600a9b0d1b5100fc2e0967e4", + "zh:36e48d48699d9faf94288925a341b6c87294830db42bc0533ff4a58b514a741e", + "zh:40c7aa690d72a5b726d2a6c76087048db2c644b5b63140bf9af0e9328703f611", + "zh:4bcb5db073877278aff3d491093ef74c55052425afd7abafef529451ad78caf0", + "zh:64eef384c37600de1a968d3137e6d894c7ea8e67976e643c23153e9d7da36bf4", + "zh:95b68253ab3b79788d62ef6dc256354b455f3356d1fb7735f72dc84656d3bc88", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a7ed803e0debc70c66642049113ea344851427f1eb0b68e4a42d4e626d08b386", + "zh:af84dd19731286f967fe232a3b635611b01115814a1ee5613f91a08937d4458c", + "zh:d4850cbcac0d1dd0d665f110979bd9a2b48ec4a44764e478505da5d4f3303b82", + "zh:e5b354d783e9600935fa4be636091c36d22d9eb0c4170a8bc8341902587e2984", + "zh:f48f078e5f2a11d278f4b9e8a96349b03b9da0b4422e901788c80ea1804c956b", + "zh:fe474dedbdf57ee3d96b99e7e85a031476ddede5555ddc26268f6f50f1971e4d", + ] +} diff --git a/tofu/modules/truenas-vm/main.tf b/tofu/modules/truenas-vm/main.tf index 2dd3310..3a078b1 100644 --- a/tofu/modules/truenas-vm/main.tf +++ b/tofu/modules/truenas-vm/main.tf @@ -1,7 +1,7 @@ terraform { required_providers { truenas = { - source = "dariusbakunas/truenas" + source = "dariusbakunas/truenas" version = "0.11.1" } } diff --git a/tofu/proxmox/main.tf b/tofu/proxmox/main.tf index 2f631a0..8a97dc9 100644 --- a/tofu/proxmox/main.tf +++ b/tofu/proxmox/main.tf @@ -37,12 +37,12 @@ module "master2" { } module "master3" { - source = "../modules/proxmox-vm" - vm_id = 3003 - vm_name = "master3.ireul.fuku" - node_name = "ireul" - ipconfig0 = "ip=192.168.1.33/24,gw=192.168.1.1" + source = "../modules/proxmox-vm" + vm_id = 3003 + vm_name = "master3.ireul.fuku" + node_name = "ireul" + ipconfig0 = "ip=192.168.1.33/24,gw=192.168.1.1" disk_storage_name = "local-lvm" - memory = 4096 - core_count = 2 + memory = 4096 + core_count = 2 }