From: Frank Brehm Date: Wed, 15 Feb 2017 14:53:25 +0000 (+0100) Subject: Adding CA-cert on calling curl X-Git-Tag: 0.8.4~23 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6af71c41aed41828e907e96ac3012e214892da6d;p=pixelpark%2Fpuppetmaster-webhooks.git Adding CA-cert on calling curl --- diff --git a/lib/webhooks/__init__.py b/lib/webhooks/__init__.py index cd141fc..4dc204c 100644 --- a/lib/webhooks/__init__.py +++ b/lib/webhooks/__init__.py @@ -1,6 +1,6 @@ #!/bin/env python3 # -*- coding: utf-8 -*- -__version__ = '0.4.6' +__version__ = '0.4.7' # vim: ts=4 et list diff --git a/lib/webhooks/r10k.py b/lib/webhooks/r10k.py index 583cfdd..5dcfc59 100644 --- a/lib/webhooks/r10k.py +++ b/lib/webhooks/r10k.py @@ -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, ]