Merge pull request #4481 from edx/nedbat/site-verification

An empty default for GOOGLE_SITE_VERIFICATION_ID

CHANGELOG.md

 - Role: edxapp
+  - Added GOOGLE_SITE_VERIFICATION_ID to move a previously hardcoded value into configuration.
   - Changed `EDXAPP_RETIRED_USERNAME_FMT` to `EDXAPP_RETIRED_USERNAME_PREFIX`. Changed/split `EDXAPP_RETIRED_EMAIL_FMT` to be `EDXAPP_RETIRED_EMAIL_PREFIX` and `EDXAPP_RETIRED_EMAIL_DOMAIN`.
 
 - Role xqueue
   - Removed RabbitMQ in earlier changes in XQueue itself, we don't need any of the configuration
-    XQUEUE_RABBITMQ_USER XQUEUE_RABBITMQ_PASS XQUEUE_RABBITMQ_VHOST XQUEUE_RABBITMQ_HOSTNAME 
+    XQUEUE_RABBITMQ_USER XQUEUE_RABBITMQ_PASS XQUEUE_RABBITMQ_VHOST XQUEUE_RABBITMQ_HOSTNAME
     XQUEUE_RABBITMQ_PORT XQUEUE_RABBITMQ_TLS
   - Added NEWRELIC_APPNAME and NEWRELIC_LICENSE_KEY to the configuration files consumed by XQueue.
     Useful for external utilities that are reporting NR metrics.
   - Added XQUEUE_CONSUMER_NEWRELIC_APPNAME which is added to the supervisor start of xqueue_consumer
     if you have New Relic enabled.
   - Retired XQUEUE_WORKERS_PER_QUEUE
-    
+
 - Role edx_django_service
   - Added maintenance page under the flag EDX_DJANGO_SERVICE_ENABLE_S3_MAINTENANCE.
   - Added the s3_maintenance.j2 file to point to the s3 maintenance page.
@@ -44,8 +45,8 @@
     to update databases while building images, where services are generally disabled).
 
 - Role: edxapp
-  - Added `EDXAPP_RETIRED_USERNAME_FMT`, `EDXAPP_RETIRED_EMAIL_FMT`, `EDXAPP_RETIRED_USER_SALTS`, and 
-  `EDXAPP_RETIREMENT_SERVICE_WORKER_USERNAME` to generic_env_config to allow user retirement to be configurable. 
+  - Added `EDXAPP_RETIRED_USERNAME_FMT`, `EDXAPP_RETIRED_EMAIL_FMT`, `EDXAPP_RETIRED_USER_SALTS`, and
+  `EDXAPP_RETIREMENT_SERVICE_WORKER_USERNAME` to generic_env_config to allow user retirement to be configurable.
 
 - Role: edxapp
   - Added `ENTERPRISE_REPORTING_SECRET` to CMS auth settings to allow edx-enterprise migrations to run.

playbooks/roles/edxapp/defaults/main.yml

@@ -499,6 +499,9 @@ EDXAPP_PRIVATE_REQUIREMENTS:
 EDXAPP_EXTRA_MIDDLEWARE_CLASSES: []
 
 EDXAPP_GOOGLE_ANALYTICS_ACCOUNT: "None"
+EDXAPP_GOOGLE_ANALYTICS_LINKEDIN: ""
+EDXAPP_GOOGLE_ANALYTICS_TRACKING_ID: ""
+EDXAPP_GOOGLE_SITE_VERIFICATION_ID: ""
 
 EDXAPP_OPTIMIZELY_PROJECT_ID: "None"
 EDXAPP_TRACKING_SEGMENTIO_WEBHOOK_SECRET: ""
@@ -511,8 +514,7 @@ EDXAPP_EDX_API_KEY: "PUT_YOUR_API_KEY_HERE"
 EDXAPP_VERIFY_STUDENT:
   DAYS_GOOD_FOR: 365
   EXPIRING_SOON_WINDOW: 28
-EDXAPP_GOOGLE_ANALYTICS_LINKEDIN: ""
-EDXAPP_GOOGLE_ANALYTICS_TRACKING_ID: ""
+
 EDXAPP_CONTENTSTORE_ADDITIONAL_OPTS: {}
 EDXAPP_BULK_EMAIL_EMAILS_PER_TASK: 500
 # If using microsites this should point to the microsite repo
@@ -1343,6 +1345,7 @@ lms_env_config:
   ACE_ROUTING_KEY: "{{ EDXAPP_ACE_ROUTING_KEY }}"
   ENTERPRISE_TAGLINE: "{{ EDXAPP_ENTERPRISE_TAGLINE }}"
   ANALYTICS_API_URL: "{{ EDXAPP_LMS_ANALYTICS_API_URL }}"
+  GOOGLE_SITE_VERIFICATION_ID: "{{ EDXAPP_GOOGLE_SITE_VERIFICATION_ID }}"
 
 cms_auth_config:
   <<: *edxapp_generic_auth