diff --git a/ansible/vars/default.yml b/ansible/vars/default.yml index 7408add..b869d02 100644 --- a/ansible/vars/default.yml +++ b/ansible/vars/default.yml @@ -4,11 +4,14 @@ username: ta-registry password: ff28a01f00c0f39315d94cd9dcb1e554968dba25676a8ea5f2be34e96a9a099f title: mozimo -tag: staging +tag: latest host_directory: "/var/lib/{{ title }}-staging" -host: "staging.mozimo.in" +www_host: "staging.mozimo.in" +www_port: 3000 +cms_host: "cms.mozimo.in" +cms_port: 8090 docker_network: "{{ title }}_net" @@ -16,20 +19,13 @@ docker_network: "{{ title }}_net" # when running the playbook by hand — rollback = -e image_tag= docker_image: "{{ registry }}/{{ title }}:{{ image_tag | default(tag) }}" docker_container: "{{ title }}-staging" -docker_port: 3000 - -instagram_token: IGQWRQSUY4b3RQWU9ZARHlVVUFDaWxJZAWFOUVllM0NxMk1zSHJ5X2JGc2dpRUxyTjBaeDNhUm0yaFZAQeUotVU9VUmFEQkJxU25CdFp3bURSZAGtnLXhCZAHVId21SWUNiNjVzc0pjZAlhPNDRxTDFzZAEQ0ZAXoyVlpUaHcZD - # hosts Caddy publishes on this box: web (SSR) + pocketbase (cms) caddy_hosts: - - host: "{{ host }}" - upstream: "{{ docker_container }}:{{ docker_port }}" + - host: "{{ www_host }}" + upstream: "{{ docker_container }}:{{ www_port }}" - host: "{{ cms_host }}" - upstream: "{{ docker_container }}:{{ pb_port }}" - -cms_host: "cms.mozimo.in" -pb_port: 8090 + upstream: "{{ docker_container }}:{{ cms_port }}" caddy_container: caddy caddyfile_path: /var/lib/caddy/conf/Caddyfile diff --git a/deploy.sh b/deploy.sh index 3a697be..51cbdbe 100755 --- a/deploy.sh +++ b/deploy.sh @@ -9,6 +9,8 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" +git push + FORCE=false PRUNE=false for arg in "$@"; do