Cleanup of certificates state.

* Renamed to cert
* Renamed some state names (no more sslcert_)
* Providing a cert inside of project pillar data
  is no longer available

README.md

@@ -145,12 +145,6 @@ The environment creation runs in the context of the project user.
   This fits our django settings approach.
   `STATIC_URL` and `STATIC_PATH` will be set automagically for you.
 
-#### `deploy.projects.[...].cert`
-
-This is just a possibility to attach a cert directly to a project.
-Those certs are added to `deploy.certs` and processed at this point.
-All fields available in `deploy.certs.[cert_name]` are available here, too.
-
 ### `deploy.certs`
 
 Each cert may have the following fields:

deploy/bundle/django-uwsgi-nginx.sls

 include:
   - deploy.bundle.django
-  - deploy.certificates
+  - deploy.certs
   - uwsgi.install
   - uwsgi.plugins
   - uwsgi.application_config

deploy/certificates.sls → deploy/certs.sls

@@ -16,7 +16,7 @@ deploy_cert_create_dir:
 
 {% for name, cert in deploy.certs.iteritems() %}
 
-sslcert_{{ name }}_pem:
+deploy_cert_{{ name }}_pem:
   file.managed:
     - name: {{ deploy.config.cert_directory }}/{{ name }}.pem
     - user: root
@@ -28,7 +28,7 @@ sslcert_{{ name }}_pem:
       - file: deploy_cert_create_dir
 
 
-sslcert_{{ name }}_key:
+deploy_cert_{{ name }}_key:
   file.managed:
     - name: {{ deploy.config.cert_directory }}/{{ name }}.key
     - user: root
@@ -41,7 +41,7 @@ sslcert_{{ name }}_key:
       - file: deploy_cert_create_dir
 
 {% if cert.chain is defined %}
-sslcert_{{ name }}_chain:
+deploy_cert_{{ name }}_chain:
   file.managed:
     - name: {{ deploy.config.cert_directory }}/{{ name }}.chain.pem
     - user: root
@@ -53,7 +53,7 @@ sslcert_{{ name }}_chain:
     - requires:
       - file: deploy_cert_create_dir
 
-sslcert_{{ name }}_fullchain:
+deploy_cert_{{ name }}_fullchain:
   file.managed:
     - name: {{ deploy.config.cert_directory }}/{{ name }}.fullchain.pem
     - user: root
@@ -67,7 +67,7 @@ sslcert_{{ name }}_fullchain:
 {% endif %}
 
 {% if cert.dhparam is defined %}
-sslcert_{{ name }}_dhparam:
+deploy_cert_{{ name }}_dhparam:
   file.managed:
     - name: {{ deploy.config.cert_directory }}/{{ name }}.dhparam.pem
     - user: root
@@ -81,7 +81,7 @@ sslcert_{{ name }}_dhparam:
 {% endif %}
 
 {% if cert.dhparam is defined and cert.chain is defined %}
-sslcert_{{ name }}_fullchain_dhparam:
+deploy_cert_{{ name }}_fullchain_dhparam:
   file.managed:
     - name: {{ deploy.config.cert_directory }}/{{ name }}.fullchain.dhparam.pem
     - user: root

deploy/map.jinja

@@ -43,9 +43,4 @@
     {% do config.update({'django': _dj_default_config}) %}
   {% endif %}
 
-  {# merge project certs with overall certs #}
-  {% set _cert = config.get('cert', False) %}
-  {% if _cert != False %}
-    {% do deploy.certs.update({name: _cert}) %}
-  {% endif %}
 {% endfor %}
\ No newline at end of file

pillar.example

@@ -25,15 +25,6 @@ deploy:
         settings_path: foo
         settings:
           ABC: 'defghi'
-      cert:
-        key: |
-          djhsajfhks
-        pem: |
-          dhkjsahfskljd
-        chain: |
-          dsdsdsa
-        dhparam: |
-          fjnskldfhskjdlghs
   certs:
     foo:
       key: |