feat: add var for volume size

.github/workflows/terraform-apply.yml

@@ -26,6 +26,7 @@ env:
   TF_VAR_aws_region: ${{ vars.TF_AWS_REGION }}
   TF_VAR_ami_id: ${{ vars.TF_AMI_ID }}
   TF_VAR_instance_type: ${{ vars.TF_INSTANCE_TYPE }}
+  TF_VAR_volume_size: ${{ vars.TF_VOLUME_SIZE }}
   TF_VAR_key_pair_name: ${{ vars.TF_KEY_PAIR_NAME }}
   TF_VAR_private_key: ${{ secrets.PRIVATE_KEY }}
   TF_VAR_domain_name: ${{ vars.TF_DOMAIN_NAME }}

.github/workflows/terraform-plan.yml

@@ -18,6 +18,7 @@ env:
   TF_VAR_aws_region: ${{ vars.TF_AWS_REGION }}
   TF_VAR_ami_id: ${{ vars.TF_AMI_ID }}
   TF_VAR_instance_type: ${{ vars.TF_INSTANCE_TYPE }}
+  TF_VAR_volume_size: ${{ vars.TF_VOLUME_SIZE }}
   TF_VAR_key_pair_name: ${{ vars.TF_KEY_PAIR_NAME }}
   TF_VAR_private_key: ${{ secrets.PRIVATE_KEY }}
   TF_VAR_domain_name: ${{ vars.TF_DOMAIN_NAME }}
@@ -55,7 +56,8 @@ jobs:
         run: | 
           terraform plan -out=tfplan.out \
           -var="ami_id=ami-005fc0f236362e99f" \
-          -var="instance_type=t2.large"
+          -var="instance_type=t2.large" \
+          -var="volume_size=16"
         working-directory: ./terraform
 
       - name: Save Plan JSON
@@ -85,13 +87,15 @@ jobs:
         run: |
           infracost breakdown --path=./terraform --format=table --out-file=/tmp/infracost-new.txt \
                               --terraform-var "ami_id=ami-005fc0f236362e99f" \
-                              --terraform-var "instance_type=t2.large"          
+                              --terraform-var "instance_type=t2.large" \
+                              --terraform-var "volume_size=16"         
           infracost diff  --path=./terraform \
                           --format=json \
                           --compare-to=/tmp/infracost-base.json \
                           --out-file=/tmp/infracost.json \
                           --terraform-var "ami_id=ami-005fc0f236362e99f" \
-                          --terraform-var "instance_type=t2.large"
+                          --terraform-var "instance_type=t2.large" \
+                          --terraform-var "volume_size=16"
 
       - name: Post Infracost Comment
         run: |

.github/workflows/terraform-validate.yml

@@ -15,6 +15,7 @@ env:
   TF_VAR_aws_region: ${{ vars.TF_AWS_REGION }}
   TF_VAR_ami_id: ${{ vars.TF_AMI_ID }}
   TF_VAR_instance_type: ${{ vars.TF_INSTANCE_TYPE }}
+  TF_VAR_volume_size: ${{ vars.TF_VOLUME_SIZE }}
   TF_VAR_key_pair_name: ${{ vars.TF_KEY_PAIR_NAME }}
   TF_VAR_private_key: ${{ secrets.PRIVATE_KEY }}
   TF_VAR_domain_name: ${{ vars.TF_DOMAIN_NAME }}

ansible/roles/docker_compose/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Run main Docker Compose
   shell: |
-    sleep 180
-    docker compose -f compose.monitoring.yml up -d
+    sleep 80
+    docker compose -f compose.monitoring.yml up -d --force-recreate
   args:
     chdir: /home/ubuntu

ansible/roles/docker_setup/tasks/main.yml

@@ -35,6 +35,19 @@
     state: started
     enabled: true
 
+- name: Add user to the Docker group
+  command: usermod -aG docker ubuntu
+  become: yes  # Required to ensure the command runs with elevated privileges
+
+- name: Apply Docker group changes for the current session
+  shell: |
+    newgrp docker << END
+    exit
+    END
+  args:
+    executable: /bin/bash
+  become: yes
+
 - name: Create app-network 
   community.docker.docker_network:
     name: app-network

ansible/roles/file_structure/tasks/main.yml

@@ -4,6 +4,8 @@
     path: "{{ item }}"
     state: directory
     mode: '0755'
+    owner: ubuntu
+    group: ubuntu
   loop:
     - /home/ubuntu/monitoring
     - /home/ubuntu/traefik

terraform/bkp.terraform.tfvars.k

@@ -9,6 +9,7 @@ frontend_domain = "cv1.drintech.online"
 db_domain       = "db.cv1.drintech.online"
 traefik_domain  = "traefik.cv1.drintech.online"
 cert_email      = "admin@example.com" # replace with a valid email
+volume_size     = 15
 
 Let's move on
 just a test

terraform/ec2.tf

@@ -8,6 +8,10 @@ resource "aws_instance" "ec2" {
     Name = var.ec2_name
   }
 
+  root_block_device {
+    volume_size = var.volume_size
+  }
+
   provisioner "local-exec" {
     command = "echo 'Instance provisioned: ${self.public_ip}'"
   }

terraform/variables.tf

@@ -38,6 +38,12 @@ variable "instance_type" {
   default     = "t2.micro"
 }
 
+variable "volume_size" {
+  description = "The size of the EBS volume in GB."
+  type        = number
+  default     = 15  # Default to 30 GB
+}
+
 variable "key_pair_name" {
   description = "Key pair name for SSH access"
   type        = string