diff --git a/hosts b/hosts index 0ae029e..6bb7398 100644 --- a/hosts +++ b/hosts @@ -15,7 +15,7 @@ wooly.masto.yttrx.com wooly.masto.yttrx.com [webapp] -#wooly.masto.yttrx.com +wooly.masto.yttrx.com [yttrx:vars] ansible_python_interpreter=/usr/bin/python3 diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml index dfea827..5a4f706 100644 --- a/roles/mastodon/tasks/main.yml +++ b/roles/mastodon/tasks/main.yml @@ -23,6 +23,16 @@ src: env.production.j2 dest: /home/mastodon/live/.env.production +- name: Install docker-compose.sh file + template: + src: docker-compose.sh.j2 + dest: /usr/local/bin/docker-compose.sh + +- name: Set permissions of docker-compose.sh + file: + path: /usr/local/bin/docker-compose.sh + mode: '0755' + - name: Install docker-compose.yml file template: src: docker-compose.yml.j2 diff --git a/roles/sidekiq/tasks/main.yml b/roles/sidekiq/tasks/main.yml index af9403d..4cceefa 100644 --- a/roles/sidekiq/tasks/main.yml +++ b/roles/sidekiq/tasks/main.yml @@ -2,5 +2,5 @@ - name: Configure docker-compose.override.yml template: src: docker-compose.override.yml.j2 - dest: /home/mastodon/live/docker-compose.override.yml + dest: /home/mastodon/live/docker-compose.sidekiq.yml notify: "docker-compose up" diff --git a/roles/webapp/tasks/main.yml b/roles/webapp/tasks/main.yml index 3df08a7..97cfbd4 100644 --- a/roles/webapp/tasks/main.yml +++ b/roles/webapp/tasks/main.yml @@ -2,5 +2,5 @@ - name: Configure docker-compose.yml template: src: docker-compose.override.yml.j2 - dest: /home/mastodon/live/docker-compose.override.yml + dest: /home/mastodon/live/docker-compose.webapp.yml notify: "docker-compose up" diff --git a/sidekiq.yml b/sidekiq.yml index 20963a4..1ada40b 100644 --- a/sidekiq.yml +++ b/sidekiq.yml @@ -6,7 +6,7 @@ handlers: - name: Re-up docker containers - command: docker-compose up -d --remove-orphans + command: /usr/local/bin/docker-compose.sh args: chdir: /home/mastodon/live listen: "docker-compose up" diff --git a/webapp.yml b/webapp.yml index dc65148..6c7f387 100644 --- a/webapp.yml +++ b/webapp.yml @@ -6,7 +6,7 @@ handlers: - name: Re-up docker containers - command: docker-compose up -d + command: /usr/local/bin/docker-compose.sh args: chdir: /home/mastodon/live listen: "docker-compose up"