From d92a068057baa8cfc0e65a61b951fdc08d01eeaa Mon Sep 17 00:00:00 2001
From: Daniele Sluijters <daniele.sluijters@nedap.com>
Date: Mon, 13 Jan 2014 13:11:18 +0100
Subject: [PATCH] Switch to using pypuppetdb 0.1.0.

---
 README.rst                      | 3 ---
 puppetboard/app.py              | 2 +-
 puppetboard/default_settings.py | 2 +-
 requirements.txt                | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index 04fd4f6..f823845 100644
--- a/README.rst
+++ b/README.rst
@@ -8,9 +8,6 @@ functionality of `Puppet Dashboard`_.
 Puppetboard relies on the `pypuppetdb`_ library to fetch data from PuppetDB
 and is built with the help of the `Flask`_ microframework.
 
-**Note**: As of the 28th of October the master branch and the upcoming 0.0.3 release
-require PuppetDB 1.5 / API v3.
-
 .. _pypuppetdb: https://pypi.python.org/pypi/pypuppetdb
 .. _PuppetDB: http://docs.puppetlabs.com/puppetdb/latest/index.html
 .. _Puppet Dashboard: http://docs.puppetlabs.com/dashboard/
diff --git a/puppetboard/app.py b/puppetboard/app.py
index eeaefaa..0ac6db7 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -33,7 +33,7 @@ puppetdb = connect(
     api_version=3,
     host=app.config['PUPPETDB_HOST'],
     port=app.config['PUPPETDB_PORT'],
-    ssl_verify=app.config['PUPPETDB_SSL'],
+    ssl_verify=app.config['PUPPETDB_SSL_VERIFY'],
     ssl_key=app.config['PUPPETDB_KEY'],
     ssl_cert=app.config['PUPPETDB_CERT'],
     timeout=app.config['PUPPETDB_TIMEOUT'],)
diff --git a/puppetboard/default_settings.py b/puppetboard/default_settings.py
index f68dfd2..12f9e20 100644
--- a/puppetboard/default_settings.py
+++ b/puppetboard/default_settings.py
@@ -1,6 +1,6 @@
 PUPPETDB_HOST = 'localhost'
 PUPPETDB_PORT = 8080
-PUPPETDB_SSL = False
+PUPPETDB_SSL_VERIFY = True
 PUPPETDB_KEY = None
 PUPPETDB_CERT = None
 PUPPETDB_TIMEOUT = 20
diff --git a/requirements.txt b/requirements.txt
index d35fb20..f1c06db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ MarkupSafe==0.18
 WTForms==1.0.4
 Werkzeug==0.9.3
 itsdangerous==0.22
-git+git://github.com/nedap/pypuppetdb.git#egg=pypuppetdb
+pypuppetdb==0.1.0
 requests==1.2.3