Merge pull request #404 from CodeNow/SAN-3816-move-logs-or-dont-its-up-to-you

app_log_dir is now variable (default: /var/log)

Author: und1sk0

ansible/group_vars/all.yml

@@ -32,6 +32,7 @@ loggly_username: ops
 ## cores and logs
 ##
 
+app_log_dir: /var/log
 core_file_dir: /var/log/core
 
 ##

ansible/group_vars/alpha-vault.yml

@@ -14,7 +14,7 @@ container_run_opts: >
   -v /opt/runnable/vault/vault.hcl:/vault.hcl:ro
   -v /opt/vault/client-consul:/opt/vault/client-consul:ro
   -v /opt/vault/server:/opt/vault/server:ro
-  -v /var/log:/var/log:rw
+  -v {{ app_log_dir }}:{{ app_log_dir }}:rw
   -p {{ ansible_default_ipv4.address }}:8200:8200
   -p {{ ansible_default_ipv4.address }}:8201:8201
   --cap-add IPC_LOCK

ansible/roles/builder/templates/basic_node/Dockerfile

@@ -45,4 +45,4 @@ RUN {{ command }}
 {% endif %}
 
 # Define default command.
-CMD ulimit -c unlimited && /usr/local/bin/npm {{ npm_start_command | default('start') }} > /var/log/{{ name }}.log 2>&1
+CMD ulimit -c unlimited && /usr/local/bin/npm {{ npm_start_command | default('start') }} > {{ app_log_dir }}/{{ name }}.log 2>&1

ansible/roles/container_kill_start/tasks/main.yml

@@ -64,7 +64,8 @@
   command: >
     sudo docker run
     --log-driver={{ log_driver | default("none")}}
-    -v /var/log:/var/log:rw
+    -v {{ app_log_dir }}:{{ app_log_dir }}:rw
+    -v /dev/log:/dev/log:rw
     --restart={{ restart_policy | default('always') }}
     {{ container_run_opts}}
     {{ container_image }}:{{ container_tag }}

ansible/roles/container_start/tasks/main.yml

@@ -28,7 +28,7 @@
 
 - name: start new container
   tags: deploy
-  shell: for i in {{ '{' }}1..{{ number_of_containers }}{{ '}' }}; do sudo docker run --log-driver=none -v /var/log:/var/log:rw --restart={{ restart_policy | default('no') }} {{ container_run_opts }} {{ container_image }}:{{ container_tag }} {{ container_run_args }}; done
+  shell: for i in {{ '{' }}1..{{ number_of_containers }}{{ '}' }}; do sudo docker run --log-driver=none -v {{ app_log_dir }}:{{ app_log_dir }}:rw -v /dev/log://dev/log:rw --restart={{ restart_policy | default('no') }} {{ container_run_opts }} {{ container_image }}:{{ container_tag }} {{ container_run_args }}; done
   args:
     executable: /bin/bash
   register: new_container_ids

ansible/roles/docker/tasks/main.yml

@@ -91,6 +91,15 @@
     update_cache=yes
     cache_valid_time=604800
 
+- name: enforce modes on /docker
+  become: true
+  file:
+    path=/docker
+    state=directory
+    owner=root
+    group=root
+    mode=0755
+
 - name: restart docker
   when: (copied_config.changed and restart is defined) or dock is defined
   command: sudo service docker restart

ansible/roles/khronos/README.md

@@ -1,3 +1,3 @@
 Run Khronos CLI tool out of cron once daily.
 
-`tasks/main.yml` - install cron entry to run `/khronos/bin/cli.js` and output to `/var/log/khonos_cron.log`
+`tasks/main.yml` - install cron entry to run `/khronos/bin/cli.js` and output to `{{ app_log_dir }}/khonos_cron.log`

ansible/roles/khronos/tasks/main.yml

@@ -17,7 +17,7 @@
   tags: cron
   cron:
     name: "{{ item.name }}"
-    job: /opt/runnable/{{ item.script }} >> /var/log/{{ item.script }}.log 2>&1
+    job: /opt/runnable/{{ item.script }} >> {{ app_log_dir }}/{{ item.script }}.log 2>&1
     minute: "{{ item.minute | default('*') }}"
     hour: "{{ item.hour | default('*') }}"
     state: "{{ item.state | default('present') }}"

ansible/roles/log-mkdir/tasks/main.yml

@@ -0,0 +1,12 @@
+---
+- name: create application logs directory
+  tags: rsyslog
+  when: app_log_dir != "/var/log"
+  become: true
+  file:
+    path="{{ app_log_dir }}"
+    state=directory
+    owner=root
+    group=syslog
+    mode=0775
+

ansible/roles/loggly-rotate/tasks/main.yml

@@ -98,7 +98,7 @@
   tags: [loggly, deploy]
   become: true
   file:
-    path=/var/log/{{ name }}-daemon.log
+    path={{ app_log_dir }}/{{ name }}-daemon.log
     state=touch
     owner=syslog
     group=adm