]> Frank Brehm's Git Trees - pixelpark/puppetmaster-webhooks.git/commitdiff
Adding CA-cert on calling curl
authorFrank Brehm <frank.brehm@pixelpark.com>
Wed, 15 Feb 2017 14:53:25 +0000 (15:53 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Wed, 15 Feb 2017 14:53:25 +0000 (15:53 +0100)
lib/webhooks/__init__.py
lib/webhooks/r10k.py

index cd141fc1ada0d7dac87d5beb308679d1d2448ef6..4dc204c8eea93c77ac19bf72b8787c13e35af9ec 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/env python3
 # -*- coding: utf-8 -*-
 
-__version__ = '0.4.6'
+__version__ = '0.4.7'
 
 # vim: ts=4 et list
index 583cfdd30168ae3b5ff042eb911924752a7bb0fa..5dcfc593141a44b6033fddb0b1e27a02e8b84204 100644 (file)
@@ -182,6 +182,8 @@ class R10kHookApp(BaseHookApp):
             self.puppetmaster_ssl_dir, 'private_keys', self.puppetmaster_host + '.pem')
         cert_file = os.path.join(
             self.puppetmaster_ssl_dir, 'certs', self.puppetmaster_host + '.pem')
+        ca_file = os.path.join(
+            self.puppetmaster_ssl_dir, 'certs', 'ca.pem')
 
         path = (
             self.puppetmaster_api_path + '/environment-cache?environment=' + 
@@ -198,6 +200,7 @@ class R10kHookApp(BaseHookApp):
             self.curl_bin, '-i',
             '--cert', cert_file,
             '--key', key_file,
+            '--cacert', ca_file,
             '-X', 'DELETE',
             url,
         ]