feat: add databases to aws setup and test new valu einjection

Author: EnricoBausenhart

.github/workflows/terraform-deploy.yml

@@ -71,4 +71,4 @@ jobs:
           echo "=== Testing SSH Connection ==="
           ssh -i vockey.pem -o StrictHostKeyChecking=no ubuntu@${{ steps.terraform.outputs.public_ip }} "echo 'SSH connection successful'"
           echo "=== Running Ansible Playbook ==="
-          ANSIBLE_HOST_KEY_CHECKING=False ANSIBLE_DEBUG=1 ansible-playbook -i inventory.yml playbooks/deploy.yml -vvv --extra-vars "ansible_host=${{ steps.terraform.outputs.public_ip }}" --start-at-task="Test connection"
+          ANSIBLE_HOST_KEY_CHECKING=False ANSIBLE_DEBUG=1 ansible-playbook -i inventory.yml playbooks/deploy.yml -vvv --extra-vars "ansible_host=${{ steps.terraform.outputs.public_ip }} EC2_PUBLIC_IP=${{ steps.terraform.outputs.public_ip }}" --start-at-task="Test connection"

deployment/compose.aws.yml

@@ -113,6 +113,34 @@ services:
     networks:
       - backend
 
+  match-database:
+    image: mysql:8.0
+    container_name: meetatmensa-matchdb
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+    volumes:
+      - matchdb_data:/var/lib/mysql
+    expose:
+      - "3306"
+    networks:
+      - backend
+
+  user-database:
+    image: mysql:8.0
+    container_name: meetatmensa-userdb
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+    volumes:
+      - userdb_data:/var/lib/mysql
+    expose:
+      - "3306"
+    networks:
+      - backend
+
 networks:
   backend:
     driver: bridge
+
+volumes:
+  matchdb_data:
+  userdb_data:

infrastructure/ansible/playbooks/deploy.yml

@@ -89,10 +89,10 @@
         dest: "{{ deployment_dir }}/compose.aws.yml"
         mode: "0644"
 
-    - name: Create .env.prod file
+    - name: Create .env file for Docker Compose
       template:
         src: "{{ playbook_dir }}/../templates/env.prod.j2"
-        dest: "{{ app_dir }}/.env.prod"
+        dest: "{{ deployment_dir }}/.env"
         mode: "0644"
 
     - name: Start Docker Compose
@@ -104,5 +104,4 @@
         build: always
         remove_orphans: yes
       environment:
-        DOCKER_BUILDKIT: 1
-        EC2_PUBLIC_IP: "{{ ansible_host }}"
+        DOCKER_BUILDKIT: 1

infrastructure/ansible/templates/env.prod.j2

@@ -1,4 +1,4 @@
-EC2_PUBLIC_IP={{ lookup('env', 'EC2_PUBLIC_IP') }}
-CLIENT_HOST=client.{{ lookup('env', 'EC2_PUBLIC_IP') }}.nip.io
-SERVER_HOST=api.{{ lookup('env', 'EC2_PUBLIC_IP') }}.nip.io
-PUBLIC_API_URL=https://api.{{ lookup('env', 'EC2_PUBLIC_IP') }}.nip.io 
+EC2_PUBLIC_IP={{ EC2_PUBLIC_IP }}
+CLIENT_HOST=client.{{ EC2_PUBLIC_IP }}.nip.io
+SERVER_HOST=api.{{ EC2_PUBLIC_IP }}.nip.io
+PUBLIC_API_URL=https://api.{{ EC2_PUBLIC_IP }}.nip.io