From 95b2e521eb7acfdad440d141a65b733dbce4b02f Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Sep 2016 23:52:37 +0200
Subject: [PATCH] Setup backports and ensure python-cryptography

Make sure that the jessie-backports repository is available and that the
python-cryptography package from that repository is used.
---
 states/base/init.sls                  | 5 +++++
 states/gnuviechadmin/webinterface.sls | 3 ++-
 states/webserver/sslcert.macros.sls   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/states/base/init.sls b/states/base/init.sls
index b1e98e8..15ec54f 100644
--- a/states/base/init.sls
+++ b/states/base/init.sls
@@ -1,3 +1,8 @@
+base:
+  pkgrepo.managed:
+    - name: deb http://httpredir.debian.org/debian jessie-backports main
+    - file: /etc/apt/sources.list.d/backports.list
+
 base-packages:
   pkg.installed:
     - pkgs:
diff --git a/states/gnuviechadmin/webinterface.sls b/states/gnuviechadmin/webinterface.sls
index 612d76b..e7e316f 100644
--- a/states/gnuviechadmin/webinterface.sls
+++ b/states/gnuviechadmin/webinterface.sls
@@ -12,8 +12,9 @@ gnuviechadmin-dev-packages:
       - pkg: gnuviechadmin-packages
 
 python-cryptography:
-  pkg.installed:
+  pkg.latest:
     - reload_modules: true
+    - fromrepo: jessie-backports
 
 {% import "webserver/sslcert.macros.sls" as sslcert %}
 
diff --git a/states/webserver/sslcert.macros.sls b/states/webserver/sslcert.macros.sls
index 9c5270e..4f753f0 100644
--- a/states/webserver/sslcert.macros.sls
+++ b/states/webserver/sslcert.macros.sls
@@ -9,6 +9,7 @@
     - bits: {{ salt['pillar.get']('nginx:keylength:' + domain_name, 2048) }}
     - require:
       - file: {{ nginx_ssl_keydir }}
+      - pkg: python-cryptography
     - require_in:
       - file: /etc/nginx/sites-available/{{ domain_name }}
       - service: nginx