Merge pull request #33 from revsys/add-fastly-pydotorg

Add FASTLY_API_KEY to django settings
python · Jan 18, 2015 · 0d424a3 · 0d424a3
2 parents a51df91 + 20308a3
commit 0d424a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pillar/prod/top.sls b/pillar/prod/top.sls
@@ -100,6 +100,7 @@ base:
     - match: nodegroup
     - pydotorg.prod
     - secrets.postgresql-users.pydotorg-prod
+    - prod.secrets.fastly
 
   'pythontest':
     - match: nodegroup

diff --git a/salt/pydotorg/config/django-settings.py.jinja b/salt/pydotorg/config/django-settings.py.jinja
@@ -51,6 +51,9 @@ MEDIA_ROOT = '/srv/pydotorg/media'
 
 PEP_REPO_PATH = '/srv/pydotorg/peps'
 
+# Fastly API Key
+FASTLY_API_KEY = '{{ pillar["fastly"]["api_key"] }}'
+
 {% if type == "staging" %}
 
 CSRF_COOKIE_DOMAIN = 'staging.python.org'