using includes for s3 sync

playbooks/roles/common/templates/edx_logrotate.j2

@@ -12,7 +12,7 @@
   {% if COMMON_S3_LOGS -%}
   sharedscripts
   postrotate
-    bash /edx/bin/send-logs-to-s3 "/edx/var/log/!(*tracking*)"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+    {% include s3-application.j2 %}
   endscript
   {% endif -%}
 }

playbooks/roles/common/templates/edx_logrotate_rsyslog.j2

@@ -37,17 +37,7 @@
     postrotate
         reload rsyslog >/dev/null 2>&1 || true
         {% if COMMON_S3_LOGS -%}
-        # wildcard expansion is fine, brace expansion won't work
-        # http://stackoverflow.com/questions/369145/how-to-glob-variables-in-bash-script
-        bash /edx/bin/send-logs-to-s3 "/var/log/mail*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/daemon*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/kern*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/auth*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/user*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/lpr*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/cron*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/debug*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
-        bash /edx/bin/send-logs-to-s3 "/var/log/messages*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+            {% include s3-rsyslog.j2 %}
         {% endif -%}
     endscript
 }

playbooks/roles/common/templates/edx_logrotate_tracking_log.j2

@@ -11,7 +11,7 @@
   {% if COMMON_S3_LOGS -%}
   sharedscripts
   postrotate
-    bash /edx/bin/send-logs-to-s3 "/edx/var/log/*tracking*"  s3://{{ COMMON_S3_LOGS_TRACKING_BUCKET }}
+    {% include s3-tracking.j2 %}
   endscript
   {% endif -%}
 

playbooks/roles/common/templates/s3-application.j2

+    bash /edx/bin/send-logs-to-s3 "{{ COMMON_LOG_DIR }}/!(*tracking*)"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}

playbooks/roles/common/templates/s3-rsyslog.j2

+        # wildcard expansion is fine, brace expansion won't work
+        # http://stackoverflow.com/questions/369145/how-to-glob-variables-in-bash-script
+        bash /edx/bin/send-logs-to-s3 "/var/log/mail*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/daemon*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/kern*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/auth*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/user*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/lpr*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/cron*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/debug*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+        bash /edx/bin/send-logs-to-s3 "/var/log/messages*"  s3://{{ COMMON_S3_LOGS_APP_BUCKET }}
+

playbooks/roles/common/templates/s3-tracking.j2

+    bash /edx/bin/send-logs-to-s3 "{{ COMMON_LOG_DIR }}/*tracking*"  s3://{{ COMMON_S3_LOGS_TRACKING_BUCKET }}