Update to prefix edxapp and remove settings that already existed.

playbooks/roles/edxapp/defaults/main.yml

@@ -97,21 +97,16 @@ EDXAPP_TIME_ZONE: 'America/New_York'
 EDXAPP_TECH_SUPPORT_EMAIL: ''
 EDXAPP_CONTACT_EMAIL: ''
 EDXAPP_BUGS_EMAIL: ''
+EDXAPP_DEFAULT_FROM_EMAIL: ''
+EDXAPP_DEFAULT_FEEDBACK_EMAIL: ''
+EDXAPP_SERVER_EMAIL: ''
+EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL: ''
 
 EDXAPP_ENV_EXTRA: {}
 EDXAPP_AUTH_EXTRA: {}
 EDXAPP_MKTG_URL_LINK_MAP: {}
 
 
-DEFAULT_FROM_EMAIL: 'default@example.com'
-DEFAULT_FEEDBACK_EMAIL: 'default@example.com'
-SERVER_EMAIL: 'default@example.com'
-TECH_SUPPORT_EMAIL: 'default@example.com'
-CONTACT_EMAIL: 'default@example.com'
-BUGS_EMAIL: 'default@example.com'
-BULK_EMAIL_DEFAULT_FROM_EMAIL: 'default@example.com'
-
-
 #-------- Everything below this line is internal to the role ------------
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
@@ -316,13 +311,10 @@ generic_env_config:  &edxapp_generic_env
     limits:
       VMEM: 0
       REALTIME: 3
-  DEFAULT_FROM_EMAIL: $DEFAULT_FROM_EMAIL
-  DEFAULT_FEEDBACK_EMAIL: $DEFAULT_FEEDBACK_EMAIL
-  SERVER_EMAIL: $DEFAULT_SERVER_EMAIL
-  TECH_SUPPORT_EMAIL: $TECH_SUPPORT_EMAIL
-  CONTACT_EMAIL: $CONTACT_EMAIL
-  BUGS_EMAIL: $BUGS_EMAIL
-  BULK_EMAIL_DEFAULT_FROM_EMAIL: $BULK_EMAIL_DEFAULT_FROM_EMAIL
+  DEFAULT_FROM_EMAIL: $EDXAPP_DEFAULT_FROM_EMAIL
+  DEFAULT_FEEDBACK_EMAIL: $EDXAPP_DEFAULT_FEEDBACK_EMAIL
+  SERVER_EMAIL: $EDXAPP_DEFAULT_SERVER_EMAIL
+  BULK_EMAIL_DEFAULT_FROM_EMAIL: $EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL
 
 
 lms_auth_config: