Apply suggestions from code review

Co-authored-by: Cyril Bitterich <[email protected]>

Author: artcz

deploy/playbooks/02_nginx.yml

@@ -12,13 +12,13 @@
       ansible.builtin.template:
         src: nginx/Makefile.nginx.j2
         dest: ./Makefile
-        mode: "0644"
+        mode: "0640"
 
     - name: Set up docker-compose.yml on the remote server
       ansible.builtin.template:
         src: nginx/docker-compose.nginx.yml.j2
         dest: ./docker-compose.yml
-        mode: "0644"
+        mode: "0640"
 
     - name: Make sure the directory structure for certs exist
       ansible.builtin.file:

deploy/playbooks/03_app.yml

@@ -12,7 +12,9 @@
     - name: Build with a given commit hash
       # This will be stored in local registry, and available as version to docker-compose
       # where we can just reference correct version
-      ansible.builtin.shell: "cd /tmp/src && make docker/build V={{ app_version }}"
+      ansible.builtin.shell: 
+        chdir: /tmp/src
+        cmd: "/usr/bin/make docker/build V={{ app_version }}"
 
     - name: Create a server Makefile to manage app tasks
       ansible.builtin.template:
@@ -24,7 +26,7 @@
       ansible.builtin.template:
         src: app/docker-compose.app.yml.j2
         dest: ./docker-compose.yml
-        mode: "0644"
+        mode: "0640"
 
     - name: Copy env file example
       ansible.builtin.copy:
@@ -49,10 +51,16 @@
       when: not env_file.stat.exists
 
     - name: Start docker compose to see if everything is running
-      ansible.builtin.shell: "docker compose up -d"
+      ansible.builtin.command:
+        chdir: {{ ansible_user_dir }}
+        cmd: "docker compose up -d"
 
     - name: Migrate on prod
-      ansible.builtin.shell: "make prod/migrate"
+      ansible.builtin.shell: 
+        chdir: /tmp/src
+        cmd: "/usr/bin/make prod/migrate"
 
     - name: Restart everything and finish
-      ansible.builtin.shell: "docker compose up -d"
+      ansible.builtin.command:
+        chdir: {{ ansible_user_dir }}
+        cmd: "docker compose up -d"