From fa129a19534b7e5b7e1f69fdbc2bbf29e730c598 Mon Sep 17 00:00:00 2001 From: geezo Date: Fri, 9 May 2025 23:01:00 +0000 Subject: [PATCH] changes --- .terraform/terraform.tfstate | 61 ++++ main.tf | 20 ++ terraform.tfstate | 539 ----------------------------------- terraform.tfstate.backup | 34 +-- 4 files changed, 98 insertions(+), 556 deletions(-) create mode 100644 .terraform/terraform.tfstate diff --git a/.terraform/terraform.tfstate b/.terraform/terraform.tfstate new file mode 100644 index 0000000..10a801c --- /dev/null +++ b/.terraform/terraform.tfstate @@ -0,0 +1,61 @@ +{ + "version": 3, + "terraform_version": "1.10.5", + "backend": { + "type": "s3", + "config": { + "access_key": "YwXYXFxiTGLWuvTpmh11", + "acl": null, + "allowed_account_ids": null, + "assume_role": null, + "assume_role_with_web_identity": null, + "bucket": "tfstate", + "custom_ca_bundle": null, + "dynamodb_endpoint": null, + "dynamodb_table": null, + "ec2_metadata_service_endpoint": null, + "ec2_metadata_service_endpoint_mode": null, + "encrypt": null, + "endpoint": null, + "endpoints": { + "dynamodb": null, + "iam": null, + "s3": "http://theocorp:9001", + "sso": null, + "sts": null + }, + "forbidden_account_ids": null, + "force_path_style": null, + "http_proxy": null, + "https_proxy": null, + "iam_endpoint": null, + "insecure": null, + "key": "vps.tfstate", + "kms_key_id": null, + "max_retries": null, + "no_proxy": null, + "profile": null, + "region": "main", + "retry_mode": null, + "secret_key": "HGoZLFky3oUCQ7tnrFLsp8TQ6MTFDcrdjeiYP9iW", + "shared_config_files": null, + "shared_credentials_file": null, + "shared_credentials_files": null, + "skip_credentials_validation": true, + "skip_metadata_api_check": true, + "skip_region_validation": true, + "skip_requesting_account_id": true, + "skip_s3_checksum": null, + "sse_customer_key": null, + "sts_endpoint": null, + "sts_region": null, + "token": null, + "use_dualstack_endpoint": null, + "use_fips_endpoint": null, + "use_lockfile": null, + "use_path_style": true, + "workspace_key_prefix": null + }, + "hash": 575151336 + } +} \ No newline at end of file diff --git a/main.tf b/main.tf index b57bac6..ab67366 100644 --- a/main.tf +++ b/main.tf @@ -1,3 +1,23 @@ provider "aws" { region = "us-east-1" # Change this to your preferred region } + +terraform { +backend "s3" { + bucket = "tfstate" # Name of the S3 bucket + endpoints = { + s3 = "http://theocorp:9001" # Minio endpoint + } + key = "vps.tfstate" # Name of the tfstate file + + access_key="YwXYXFxiTGLWuvTpmh11" # Access and secret keys + secret_key="HGoZLFky3oUCQ7tnrFLsp8TQ6MTFDcrdjeiYP9iW" + + region = "main" # Region validation will be skipped + skip_credentials_validation = true # Skip AWS related checks and validations + skip_requesting_account_id = true + skip_metadata_api_check = true + skip_region_validation = true + use_path_style = true # Enable path-style S3 URLs (https:/// https://developer.hashicorp.com/terraform/language/settings/backends/s3#use_path_style +} +} diff --git a/terraform.tfstate b/terraform.tfstate index 5971d39..e69de29 100644 --- a/terraform.tfstate +++ b/terraform.tfstate @@ -1,539 +0,0 @@ -{ - "version": 4, - "terraform_version": "1.10.5", - "serial": 48, - "lineage": "1548454c-cf7f-9153-d2ca-6d37af1f5a24", - "outputs": { - "instance_public_ip": { - "value": "44.210.184.15", - "type": "string" - }, - "instance_public_ip_netbird": { - "value": "18.211.242.110", - "type": "string" - } - }, - "resources": [ - { - "mode": "managed", - "type": "aws_eip", - "name": "ec2_eip", - "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "address": null, - "allocation_id": "eipalloc-0f33067513f18436b", - "arn": "arn:aws:ec2:us-east-1:874570603861:elastic-ip/eipalloc-0f33067513f18436b", - "associate_with_private_ip": null, - "association_id": "eipassoc-09b2937ea57df42e0", - "carrier_ip": "", - "customer_owned_ip": "", - "customer_owned_ipv4_pool": "", - "domain": "vpc", - "id": "eipalloc-0f33067513f18436b", - "instance": "i-0434f1dba567a3cd7", - "ipam_pool_id": null, - "network_border_group": "us-east-1", - "network_interface": "eni-0ac9da47e8ed218a9", - "private_dns": "ip-172-31-83-214.ec2.internal", - "private_ip": "172.31.83.214", - "ptr_record": "", - "public_dns": "ec2-44-210-184-15.compute-1.amazonaws.com", - "public_ip": "44.210.184.15", - "public_ipv4_pool": "amazon", - "tags": {}, - "tags_all": {}, - "timeouts": null, - "vpc": true - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjkwMDAwMDAwMDAwMCwidXBkYXRlIjozMDAwMDAwMDAwMDB9fQ==", - "dependencies": [ - "aws_instance.ec2_vm", - "aws_security_group.ec2_sg" - ] - } - ] - }, - { - "mode": "managed", - "type": "aws_eip", - "name": "ec2_eip_netbird", - "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "address": null, - "allocation_id": "eipalloc-0c63042a76eff7889", - "arn": "arn:aws:ec2:us-east-1:874570603861:elastic-ip/eipalloc-0c63042a76eff7889", - "associate_with_private_ip": null, - "association_id": "eipassoc-0e3c1e5a6282ecefe", - "carrier_ip": "", - "customer_owned_ip": "", - "customer_owned_ipv4_pool": "", - "domain": "vpc", - "id": "eipalloc-0c63042a76eff7889", - "instance": "i-0d86c676daa4ad5c7", - "ipam_pool_id": null, - "network_border_group": "us-east-1", - "network_interface": "eni-0b11f199514741ce9", - "private_dns": "ip-172-31-81-102.ec2.internal", - "private_ip": "172.31.81.102", - "ptr_record": "", - "public_dns": "ec2-18-211-242-110.compute-1.amazonaws.com", - "public_ip": "18.211.242.110", - "public_ipv4_pool": "amazon", - "tags": {}, - "tags_all": {}, - "timeouts": null, - "vpc": true - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjkwMDAwMDAwMDAwMCwidXBkYXRlIjozMDAwMDAwMDAwMDB9fQ==", - "dependencies": [ - "aws_instance.ec2_vm_netbird", - "aws_security_group.ec2_sg" - ] - } - ] - }, - { - "mode": "managed", - "type": "aws_instance", - "name": "ec2_vm", - "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", - "instances": [ - { - "schema_version": 1, - "attributes": { - "ami": "ami-02a53b0d62d37a757", - "arn": "arn:aws:ec2:us-east-1:874570603861:instance/i-0434f1dba567a3cd7", - "associate_public_ip_address": true, - "availability_zone": "us-east-1a", - "capacity_reservation_specification": [ - { - "capacity_reservation_preference": "open", - "capacity_reservation_target": [] - } - ], - "cpu_core_count": 1, - "cpu_options": [ - { - "amd_sev_snp": "", - "core_count": 1, - "threads_per_core": 1 - } - ], - "cpu_threads_per_core": 1, - "credit_specification": [ - { - "cpu_credits": "standard" - } - ], - "disable_api_stop": false, - "disable_api_termination": false, - "ebs_block_device": [], - "ebs_optimized": false, - "enable_primary_ipv6": null, - "enclave_options": [ - { - "enabled": false - } - ], - "ephemeral_block_device": [], - "get_password_data": false, - "hibernation": false, - "host_id": "", - "host_resource_group_arn": null, - "iam_instance_profile": "", - "id": "i-0434f1dba567a3cd7", - "instance_initiated_shutdown_behavior": "stop", - "instance_lifecycle": "", - "instance_market_options": [], - "instance_state": "running", - "instance_type": "t2.micro", - "ipv6_address_count": 0, - "ipv6_addresses": [], - "key_name": "theocorp", - "launch_template": [], - "maintenance_options": [ - { - "auto_recovery": "default" - } - ], - "metadata_options": [ - { - "http_endpoint": "enabled", - "http_protocol_ipv6": "disabled", - "http_put_response_hop_limit": 1, - "http_tokens": "optional", - "instance_metadata_tags": "disabled" - } - ], - "monitoring": false, - "network_interface": [], - "outpost_arn": "", - "password_data": "", - "placement_group": "", - "placement_partition_number": 0, - "primary_network_interface_id": "eni-0ac9da47e8ed218a9", - "private_dns": "ip-172-31-83-214.ec2.internal", - "private_dns_name_options": [ - { - "enable_resource_name_dns_a_record": false, - "enable_resource_name_dns_aaaa_record": false, - "hostname_type": "ip-name" - } - ], - "private_ip": "172.31.83.214", - "public_dns": "ec2-44-210-184-15.compute-1.amazonaws.com", - "public_ip": "44.210.184.15", - "root_block_device": [ - { - "delete_on_termination": true, - "device_name": "/dev/xvda", - "encrypted": false, - "iops": 100, - "kms_key_id": "", - "tags": {}, - "tags_all": {}, - "throughput": 0, - "volume_id": "vol-0d3cf7178ed164cb7", - "volume_size": 8, - "volume_type": "gp2" - } - ], - "secondary_private_ips": [], - "security_groups": [ - "aviary-sg" - ], - "source_dest_check": true, - "spot_instance_request_id": "", - "subnet_id": "subnet-02a8be59a072d7d45", - "tags": { - "Name": "pangolin" - }, - "tags_all": { - "Name": "pangolin" - }, - "tenancy": "default", - "timeouts": null, - "user_data": null, - "user_data_base64": null, - "user_data_replace_on_change": false, - "volume_tags": null, - "vpc_security_group_ids": [ - "sg-0b751004f80b5fe74" - ] - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwicmVhZCI6OTAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", - "dependencies": [ - "aws_security_group.ec2_sg" - ] - } - ] - }, - { - "mode": "managed", - "type": "aws_instance", - "name": "ec2_vm_netbird", - "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", - "instances": [ - { - "schema_version": 1, - "attributes": { - "ami": "ami-02a53b0d62d37a757", - "arn": "arn:aws:ec2:us-east-1:874570603861:instance/i-0d86c676daa4ad5c7", - "associate_public_ip_address": true, - "availability_zone": "us-east-1a", - "capacity_reservation_specification": [ - { - "capacity_reservation_preference": "open", - "capacity_reservation_target": [] - } - ], - "cpu_core_count": 1, - "cpu_options": [ - { - "amd_sev_snp": "", - "core_count": 1, - "threads_per_core": 1 - } - ], - "cpu_threads_per_core": 1, - "credit_specification": [ - { - "cpu_credits": "standard" - } - ], - "disable_api_stop": false, - "disable_api_termination": false, - "ebs_block_device": [], - "ebs_optimized": false, - "enable_primary_ipv6": null, - "enclave_options": [ - { - "enabled": false - } - ], - "ephemeral_block_device": [], - "get_password_data": false, - "hibernation": false, - "host_id": "", - "host_resource_group_arn": null, - "iam_instance_profile": "", - "id": "i-0d86c676daa4ad5c7", - "instance_initiated_shutdown_behavior": "stop", - "instance_lifecycle": "", - "instance_market_options": [], - "instance_state": "running", - "instance_type": "t2.micro", - "ipv6_address_count": 0, - "ipv6_addresses": [], - "key_name": "theocorp", - "launch_template": [], - "maintenance_options": [ - { - "auto_recovery": "default" - } - ], - "metadata_options": [ - { - "http_endpoint": "enabled", - "http_protocol_ipv6": "disabled", - "http_put_response_hop_limit": 1, - "http_tokens": "optional", - "instance_metadata_tags": "disabled" - } - ], - "monitoring": false, - "network_interface": [], - "outpost_arn": "", - "password_data": "", - "placement_group": "", - "placement_partition_number": 0, - "primary_network_interface_id": "eni-0b11f199514741ce9", - "private_dns": "ip-172-31-81-102.ec2.internal", - "private_dns_name_options": [ - { - "enable_resource_name_dns_a_record": false, - "enable_resource_name_dns_aaaa_record": false, - "hostname_type": "ip-name" - } - ], - "private_ip": "172.31.81.102", - "public_dns": "ec2-18-211-242-110.compute-1.amazonaws.com", - "public_ip": "18.211.242.110", - "root_block_device": [ - { - "delete_on_termination": true, - "device_name": "/dev/xvda", - "encrypted": false, - "iops": 100, - "kms_key_id": "", - "tags": {}, - "tags_all": {}, - "throughput": 0, - "volume_id": "vol-08238e1cc82c3d352", - "volume_size": 8, - "volume_type": "gp2" - } - ], - "secondary_private_ips": [], - "security_groups": [ - "aviary-sg" - ], - "source_dest_check": true, - "spot_instance_request_id": "", - "subnet_id": "subnet-02a8be59a072d7d45", - "tags": { - "Name": "netbird" - }, - "tags_all": { - "Name": "netbird" - }, - "tenancy": "default", - "timeouts": null, - "user_data": null, - "user_data_base64": null, - "user_data_replace_on_change": false, - "volume_tags": null, - "vpc_security_group_ids": [ - "sg-0b751004f80b5fe74" - ] - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwicmVhZCI6OTAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", - "dependencies": [ - "aws_security_group.ec2_sg" - ] - } - ] - }, - { - "mode": "managed", - "type": "aws_security_group", - "name": "ec2_sg", - "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", - "instances": [ - { - "schema_version": 1, - "attributes": { - "arn": "arn:aws:ec2:us-east-1:874570603861:security-group/sg-0b751004f80b5fe74", - "description": "Allow SSH inbound traffic", - "egress": [ - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 0, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "-1", - "security_groups": [], - "self": false, - "to_port": 0 - } - ], - "id": "sg-0b751004f80b5fe74", - "ingress": [ - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 10000, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "tcp", - "security_groups": [], - "self": false, - "to_port": 10000 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 33073, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "tcp", - "security_groups": [], - "self": false, - "to_port": 33073 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 33080, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "tcp", - "security_groups": [], - "self": false, - "to_port": 33080 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 3478, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "udp", - "security_groups": [], - "self": false, - "to_port": 3478 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 443, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "tcp", - "security_groups": [], - "self": false, - "to_port": 443 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 49152, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "udp", - "security_groups": [], - "self": false, - "to_port": 65535 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 51820, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "udp", - "security_groups": [], - "self": false, - "to_port": 51820 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": "", - "from_port": 80, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "tcp", - "security_groups": [], - "self": false, - "to_port": 80 - }, - { - "cidr_blocks": [ - "108.237.185.23/32" - ], - "description": "", - "from_port": 22, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "tcp", - "security_groups": [], - "self": false, - "to_port": 22 - } - ], - "name": "aviary-sg", - "name_prefix": "", - "owner_id": "874570603861", - "revoke_rules_on_delete": false, - "tags": {}, - "tags_all": {}, - "timeouts": null, - "vpc_id": "vpc-0ea47c82201349205" - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6OTAwMDAwMDAwMDAwfSwic2NoZW1hX3ZlcnNpb24iOiIxIn0=" - } - ] - } - ], - "check_results": null -} diff --git a/terraform.tfstate.backup b/terraform.tfstate.backup index 846c8f7..5971d39 100644 --- a/terraform.tfstate.backup +++ b/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.10.5", - "serial": 47, + "serial": 48, "lineage": "1548454c-cf7f-9153-d2ca-6d37af1f5a24", "outputs": { "instance_public_ip": { @@ -459,19 +459,6 @@ "0.0.0.0/0" ], "description": "", - "from_port": 49152, - "ipv6_cidr_blocks": [], - "prefix_list_ids": [], - "protocol": "udp", - "security_groups": [], - "self": false, - "to_port": 65535 - }, - { - "cidr_blocks": [ - "0.0.0.0/0" - ], - "description": null, "from_port": 443, "ipv6_cidr_blocks": [], "prefix_list_ids": [], @@ -484,7 +471,20 @@ "cidr_blocks": [ "0.0.0.0/0" ], - "description": null, + "description": "", + "from_port": 49152, + "ipv6_cidr_blocks": [], + "prefix_list_ids": [], + "protocol": "udp", + "security_groups": [], + "self": false, + "to_port": 65535 + }, + { + "cidr_blocks": [ + "0.0.0.0/0" + ], + "description": "", "from_port": 51820, "ipv6_cidr_blocks": [], "prefix_list_ids": [], @@ -497,7 +497,7 @@ "cidr_blocks": [ "0.0.0.0/0" ], - "description": null, + "description": "", "from_port": 80, "ipv6_cidr_blocks": [], "prefix_list_ids": [], @@ -510,7 +510,7 @@ "cidr_blocks": [ "108.237.185.23/32" ], - "description": null, + "description": "", "from_port": 22, "ipv6_cidr_blocks": [], "prefix_list_ids": [],