From bf53429e0fe469ab3bd9946f2617026b9d947702 Mon Sep 17 00:00:00 2001 From: CJ_Clippy Date: Sun, 5 Oct 2025 22:19:07 -0800 Subject: [PATCH] use command instead of entrypoing --- ansible/roles/loadbalancer/tasks/main.yml | 2 +- ansible/roles/our/handlers/main.yml | 2 +- ansible/roles/our/tasks/deploy.yml | 60 ----------------------- ansible/roles/our/tasks/filesystem.yml | 1 + ansible/roles/our/tasks/main.yml | 4 +- ansible/roles/our/tasks/old.yml | 2 +- ansible/roles/our/tasks/stack.yml | 59 ++++++++++++++++++++++ services/our/compose.production.yaml | 2 +- terraform/main.tf | 54 ++++++++++---------- 9 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 ansible/roles/our/tasks/deploy.yml diff --git a/ansible/roles/loadbalancer/tasks/main.yml b/ansible/roles/loadbalancer/tasks/main.yml index 192ee1d..064ce5a 100644 --- a/ansible/roles/loadbalancer/tasks/main.yml +++ b/ansible/roles/loadbalancer/tasks/main.yml @@ -23,4 +23,4 @@ src: 'templates/Caddyfile.j2' dest: /etc/caddy/Caddyfile mode: "0644" - notify: restart caddy + notify: reload caddy diff --git a/ansible/roles/our/handlers/main.yml b/ansible/roles/our/handlers/main.yml index 4a39547..dcb6754 100644 --- a/ansible/roles/our/handlers/main.yml +++ b/ansible/roles/our/handlers/main.yml @@ -2,7 +2,7 @@ - name: Mount vfs ansible.posix.mount: - src: "{{ vfs_mount_tag }}" + src: "{{ our_vfs_mount_tag }}" path: /mnt/vfs fstype: virtiofs state: mounted diff --git a/ansible/roles/our/tasks/deploy.yml b/ansible/roles/our/tasks/deploy.yml deleted file mode 100644 index 1d4fb40..0000000 --- a/ansible/roles/our/tasks/deploy.yml +++ /dev/null @@ -1,60 +0,0 @@ ---- -- name: Create directory - ansible.builtin.file: - path: /etc/futureporn/our - state: directory - mode: "0755" - -- name: Copy env file - ansible.builtin.copy: - src: ../../../../.env.production - dest: /etc/futureporn/our/.env - mode: "0600" - -- name: Clone the latest code - ansible.builtin.git: - repo: https://gitea.futureporn.net/futureporn/fp - dest: /tmp/checkout - single_branch: true - version: main - clone: true - force: true - -- name: Copy compose files - ansible.builtin.copy: - remote_src: true - src: "/tmp/checkout/services/our/{{ item }}" - dest: "/etc/futureporn/our/{{ item }}" - mode: "0744" - loop: - - compose.db.yaml - - compose.production.yaml - - compose.green.yaml - - compose.blue.yaml - -- name: Deploy db stack - community.docker.docker_stack: - state: present - name: our-postgres - compose: - - /etc/futureporn/our/compose.db.yaml - -- name: Deploy stack to green - community.docker.docker_stack: - state: present - name: our-green - compose: - - /etc/futureporn/our/compose.production.yaml - - /etc/futureporn/our/compose.green.yaml - -- name: Deploy stack to blue - community.docker.docker_stack: - state: present - name: our-blue - compose: - - /etc/futureporn/our/compose.production.yaml - - /etc/futureporn/our/compose.blue.yaml -# - name: Remove stack -# community.docker.docker_stack: -# name: mystack -# state: absent diff --git a/ansible/roles/our/tasks/filesystem.yml b/ansible/roles/our/tasks/filesystem.yml index eb14ac8..01a287a 100644 --- a/ansible/roles/our/tasks/filesystem.yml +++ b/ansible/roles/our/tasks/filesystem.yml @@ -8,4 +8,5 @@ src: "{{ our_vfs_mount_tag }}" path: /mnt/vfs fstype: virtiofs + opts: defaults,_netdev state: mounted diff --git a/ansible/roles/our/tasks/main.yml b/ansible/roles/our/tasks/main.yml index 3c5fe6a..7ef34b2 100644 --- a/ansible/roles/our/tasks/main.yml +++ b/ansible/roles/our/tasks/main.yml @@ -8,6 +8,6 @@ ansible.builtin.include_tasks: file: stack.yml -- name: Deploy our +- name: Deploy our via docker stack ansible.builtin.include_tasks: - file: deploy.yml + file: stack.yml diff --git a/ansible/roles/our/tasks/old.yml b/ansible/roles/our/tasks/old.yml index 70f5dc1..31109c3 100644 --- a/ansible/roles/our/tasks/old.yml +++ b/ansible/roles/our/tasks/old.yml @@ -43,4 +43,4 @@ - name: Get the VFS mount_tag ansible.builtin.set_fact: - vfs_mount_tag: "{{ vfs_attach.json.mount_tag | default('') }}" + our_vfs_mount_tag: "{{ vfs_attach.json.mount_tag | default('') }}" diff --git a/ansible/roles/our/tasks/stack.yml b/ansible/roles/our/tasks/stack.yml index ed97d53..1d4fb40 100644 --- a/ansible/roles/our/tasks/stack.yml +++ b/ansible/roles/our/tasks/stack.yml @@ -1 +1,60 @@ --- +- name: Create directory + ansible.builtin.file: + path: /etc/futureporn/our + state: directory + mode: "0755" + +- name: Copy env file + ansible.builtin.copy: + src: ../../../../.env.production + dest: /etc/futureporn/our/.env + mode: "0600" + +- name: Clone the latest code + ansible.builtin.git: + repo: https://gitea.futureporn.net/futureporn/fp + dest: /tmp/checkout + single_branch: true + version: main + clone: true + force: true + +- name: Copy compose files + ansible.builtin.copy: + remote_src: true + src: "/tmp/checkout/services/our/{{ item }}" + dest: "/etc/futureporn/our/{{ item }}" + mode: "0744" + loop: + - compose.db.yaml + - compose.production.yaml + - compose.green.yaml + - compose.blue.yaml + +- name: Deploy db stack + community.docker.docker_stack: + state: present + name: our-postgres + compose: + - /etc/futureporn/our/compose.db.yaml + +- name: Deploy stack to green + community.docker.docker_stack: + state: present + name: our-green + compose: + - /etc/futureporn/our/compose.production.yaml + - /etc/futureporn/our/compose.green.yaml + +- name: Deploy stack to blue + community.docker.docker_stack: + state: present + name: our-blue + compose: + - /etc/futureporn/our/compose.production.yaml + - /etc/futureporn/our/compose.blue.yaml +# - name: Remove stack +# community.docker.docker_stack: +# name: mystack +# state: absent diff --git a/services/our/compose.production.yaml b/services/our/compose.production.yaml index c09877e..f60dd6f 100644 --- a/services/our/compose.production.yaml +++ b/services/our/compose.production.yaml @@ -5,7 +5,7 @@ services: depends_on: - postgres init: true - entrypoint: > + command: > sh -c "npx prisma migrate deploy && npm run start:server" volumes: - /mnt/vfs/futureporn:/mnt/vfs/futureporn diff --git a/terraform/main.tf b/terraform/main.tf index 2b66529..ddf1b4b 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -101,17 +101,17 @@ resource "vultr_vpc" "futureporn_vpc" { region = "ord" } -resource "bunnynet_dns_record" "future_porn_a" { - for_each = zipmap( - range(length(vultr_instance.our_vps)), - vultr_instance.our_vps - ) +# resource "bunnynet_dns_record" "future_porn_a" { +# for_each = zipmap( +# range(length(vultr_instance.our_vps)), +# vultr_instance.our_vps +# ) - zone = bunnynet_dns_zone.future_porn.id - name = "*" - type = "A" - value = each.value.main_ip -} +# zone = bunnynet_dns_zone.future_porn.id +# name = "*" +# type = "A" +# value = each.value.main_ip +# } @@ -141,23 +141,23 @@ resource "bunnynet_dns_zone" "future_porn" { # } # our0 -resource "vultr_instance" "our_vps" { - count = 1 - hostname = "fp-our-${count.index}" - plan = "vc2-4c-8gb" - region = "ord" - backups = "disabled" - ddos_protection = "false" - os_id = 1743 - enable_ipv6 = true - label = "fp our ${count.index}" - tags = ["futureporn", "our", "tofu"] - ssh_key_ids = [local.envs.VULTR_SSH_KEY_ID] - user_data = base64encode(var.vps_user_data) - vpc_ids = [ - vultr_vpc.futureporn_vpc.id - ] -} +# resource "vultr_instance" "our_vps" { +# count = 1 +# hostname = "fp-our-${count.index}" +# plan = "vc2-4c-8gb" +# region = "ord" +# backups = "disabled" +# ddos_protection = "false" +# os_id = 1743 +# enable_ipv6 = true +# label = "fp our ${count.index}" +# tags = ["futureporn", "our", "tofu"] +# ssh_key_ids = [local.envs.VULTR_SSH_KEY_ID] +# user_data = base64encode(var.vps_user_data) +# vpc_ids = [ +# vultr_vpc.futureporn_vpc.id +# ] +# } # resource "bunnynet_dns_record" "future_porn_apex" {