Merge branch 'release-v2.1.0'

dpla-attic · Oct 19, 2015 · 96e182a · 96e182a
2 parents c5f1da7 + 7200f64
commit 96e182a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.0
+2.1.0
diff --git a/ansible/roles/pss/defaults/main.yml b/ansible/roles/pss/defaults/main.yml
@@ -10,6 +10,8 @@ pss_secret_key_base: 9d0c334e9aa3d80e27ff0f9a370c21611cbbf80db7206ed19c48081d8bc
 # settings.local.yml values
 pss_devise_mail_sender: [email protected]
 pss_frontend_url: http://example.org
+pss_exhibitions_url: http://example.org
+pss_wordpress_url: http://example.org
 pss_app_scheme: http://
 pss_app_host: local.dp.la
 pss_aws_region: us-east-1
@@ -22,3 +24,4 @@ pss_zencoder_api_key: OVERRIDE-THIS
 pss_zencoder_notification_user: OVERRIDE-THIS
 pss_zencoder_notification_pass: OVERRIDE-THIS
 pss_zencoder_s3_credentials_name: false
+pss_contact_email: [email protected]
diff --git a/ansible/roles/pss/templates/settings.local.yml.j2 b/ansible/roles/pss/templates/settings.local.yml.j2
@@ -6,6 +6,12 @@ devise:
 frontend:
   url: {{ pss_frontend_url }}
 
+wordpress:
+  url: {{ pss_wordpress_url }}
+
+exhibitions:
+  url: {{ pss_exhibitions_url }}
+
 app_scheme: {{ pss_app_scheme }}
 app_host: {{ pss_app_host }}
 
@@ -27,3 +33,5 @@ zencoder:
 
 googleanalytics:
   tracker: {{ google_analytics_property_id }}
+
+contact_email: {{ pss_contact_email }}