diff --git a/.env.example b/.env.example index 594b2358..76ec262b 100644 --- a/.env.example +++ b/.env.example @@ -37,11 +37,11 @@ # Access token for the Vending Machine API (required) #VM_API_TOKEN="CHANGEME" -# Git branch to track and Docker image tag (default: master) -#VM_BRANCH=master +# Git branch to track and Docker image tag (default: main) +#VM_BRANCH=main # Docker image tag (default: value of VM_BRANCH) -#VM_IMAGE_TAG=master +#VM_IMAGE_TAG=main # Port to run image under (default: 3000) #VM_PORT=3000 diff --git a/ansible/roles/vm_frontend/tasks/main.yml b/ansible/roles/vm_frontend/tasks/main.yml index 2235dd94..c585ee94 100644 --- a/ansible/roles/vm_frontend/tasks/main.yml +++ b/ansible/roles/vm_frontend/tasks/main.yml @@ -34,7 +34,7 @@ job: '/bin/sleep {{ 300 | random }}; {{ REPO }}/runme.sh > {{ REPO }}/logs/run-ansible.log 2>&1' minute: '2,17,32,47' hour: '*' - when: vm_frontend_version == 'master' + when: vm_frontend_version == 'main' - name: Set net.core.rmem_max ansible.posix.sysctl: diff --git a/runme.sh b/runme.sh index d4481a57..889cce5d 100755 --- a/runme.sh +++ b/runme.sh @@ -2,7 +2,7 @@ __repo=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P) -VM_BRANCH=${VM_BRANCH:-master} +VM_BRANCH=${VM_BRANCH:-main} ### # Check for .env