fixing references to the bucket names

playbooks/roles/common/defaults/main.yml

@@ -29,7 +29,7 @@ COMMON_CUSTOM_DHCLIENT_CONFIG: false
 # Rotate logs to S3
 # Only for when edX is running in AWS since it organizes
 # logs by security group.
-# The two buckets defined below MUST exist prior to enabling
+# !! The buckets defined below MUST exist prior to enabling !!
 # this feature and the instance IAM role must have write permissions
 # to the buckets
 COMMON_S3_LOGS: false
@@ -40,13 +40,13 @@ COMMON_S3_LOGS_NOTIFY_MAIL: dummy@example.com
 # Separate buckets for tracking logs and everything else
 # You should be overriding the environment and deployment vars
 COMMON_S3_LOG_PATHS:
-  - bucket: "{{ COMMON_S3_LOGS_APP_BUCKET }}"
+  - bucket: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-app-logs"
     paths:
     # globs are ok, do not use brace expansion
     # everything except tracking logs
     - "{{ COMMON_LOG_DIR }}/!(*tracking*)"
     - "/var/log/*"
-  - bucket: "{{ COMMON_S3_LOGS_TRACKING_BUCKET }}"
+  - bucket: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-tracking-logs"
     paths:
     - "{{ COMMON_LOG_DIR }}/*tracking*"
 common_debian_pkgs:

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 }}