daily autocommit

diff --git a/.etckeeper b/.etckeeper
index d48a0a06f4d4a40a7b3255d010704f8acce0277e..da9dcda27f026c410bb33b25fbc386baf3aa9f22 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1799,6 +1799,18 @@ maybe chmod 0750 'puppetlabs/puppet'
 maybe chmod 0644 'puppetlabs/puppet/hiera.yaml'
 maybe chmod 0644 'puppetlabs/puppet/puppet.conf'
 maybe chmod 0644 'puppetlabs/puppet/puppetdb.conf'
+maybe chown 'puppet' 'puppetlabs/puppet/secure'
+maybe chgrp 'puppet' 'puppetlabs/puppet/secure'
+maybe chmod 0755 'puppetlabs/puppet/secure'
+maybe chown 'puppet' 'puppetlabs/puppet/secure/keys'
+maybe chgrp 'puppet' 'puppetlabs/puppet/secure/keys'
+maybe chmod 0500 'puppetlabs/puppet/secure/keys'
+maybe chown 'puppet' 'puppetlabs/puppet/secure/keys/private_key.pkcs7.pem'
+maybe chgrp 'puppet' 'puppetlabs/puppet/secure/keys/private_key.pkcs7.pem'
+maybe chmod 0400 'puppetlabs/puppet/secure/keys/private_key.pkcs7.pem'
+maybe chown 'puppet' 'puppetlabs/puppet/secure/keys/public_key.pkcs7.pem'
+maybe chgrp 'puppet' 'puppetlabs/puppet/secure/keys/public_key.pkcs7.pem'
+maybe chmod 0400 'puppetlabs/puppet/secure/keys/public_key.pkcs7.pem'
 maybe chown 'puppet' 'puppetlabs/puppet/ssl'
 maybe chgrp 'puppet' 'puppetlabs/puppet/ssl'
 maybe chmod 0771 'puppetlabs/puppet/ssl'

diff --git a/puppetlabs/puppet/hiera.yaml b/puppetlabs/puppet/hiera.yaml
index f24314946880862e7fee7eae949321116911747d..1eb239cd2b881267dda996feb37cbd4b0204e332 100644 (file)
--- a/puppetlabs/puppet/hiera.yaml
+++ b/puppetlabs/puppet/hiera.yaml
@@ -1,5 +1,6 @@
 ---
 :backends:
+  - eyaml
   - yaml
   - json
 :yaml:
@@ -10,6 +11,11 @@
   - "nodes/%{::trusted.certname}"
   - "virtual/%{::virtual}"
   - "common"
-# :merge_behavior: deeper
+:merge_behavior: deeper
+:eyaml:
+  :datadir: "/etc/puppetlabs/code/environments/%{::environment}/hieradata"
+  :extension: 'yaml'
+  :pkcs7_private_key: /etc/puppetlabs/puppet/secure/keys/private_key.pkcs7.pem
+  :pkcs7_public_key: /etc/puppetlabs/puppet/secure/keys/public_key.pkcs7.pem
 # :deep_merge_options:
 #   :knockout_prefix: '--'

diff --git a/puppetlabs/puppet/secure/keys/private_key.pkcs7.pem b/puppetlabs/puppet/secure/keys/private_key.pkcs7.pem
new file mode 100644 (file)
index 0000000..5ae8005
--- /dev/null
+++ b/puppetlabs/puppet/secure/keys/private_key.pkcs7.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEAxJWUYjSZKPxDwQy/janPlAcs+7YrY2IvLwyDea1OPdxJ1hoL
+NUYhNuH5c2VySkbEBhkHfPgNb76rG791xk8r8Q1XGSTOi6EsnIcGR+YE0EgbRJBl
+ViPrrgx2CIfjD/9NOTWXe3hRtl8fSrGX79wat5aXUtGuna7w/tO0ybRDJGUcRz6d
+41Dthzrc41rBuv/5ICXMPtDCIynL9KNxSrpVMtdhOT5JhsfWqPboTQdQDDfm7wBy
+uIeDTbHFEgXh0AzIZZtWnvcEkhicOQGXWce+5+lQhNc5CjuUsUT0iXW3Vl1MajPx
+6MOh4Ult40EucAiBQ74gXGnX/vIpXsswNCnIaQIDAQABAoIBAQCpjhJTueY4kYym
+36YAO+zMUnwcBv3ZVIA55mMn+bC4bl5JCmGMa5aOTc3oGCHBqtO8Jq5svU5piVzw
+K+0bRII0ATuUdkin6jYeM9/Y965DL05Fjv24lHbcwea0aPARhjRHGdA0MIzZ7aWB
+uTfBLGjm3D5csnoXiyJVyKfwKUiYBBFQJv3MQfifylhjNXmz2SDOKr8BmVnuS9q7
+WiBMJ8oZVRcGDxtJa0IzcYrHekehY8jBO42HSs1dTwt0P/4PNdD6JyfRhJNSCdxI
+00DKglU8ULk5Zkfw71LovcicBDiHC07I6w6U1A8lZUl4WXmB3qzPZgn/zF9K6vF6
+xsIF2p45AoGBAPPhYt89ZxGCDB4bkh9gWE1XIq4t/p7Qe6jO025F9CQW0xqlxnMe
+1luqcOeg5U9nb3TDSP87/Lb8DTKPB403Xlsl3vME4FPMfxiDkZJj6kYR8Wi6uVCY
+ZE8eDC8UAFltydvuOLgzgIFuJasn66qBgu++bVUw8YRsNUTZX8aE9mUbAoGBAM5a
+f6CZCM5OzxN/9McWI17C0+cqOe7l7KiSh3g5m5nbib2Nx3xL/2B1+DO8S9E3+Xvw
+g3lhGHoXhruHTGXmf06t2cgc735jxTLdbgTz0nDYCvS92ITy07Z4j8PiOHNn64Sc
+EuL4pjEZtdTgS2hTmxGLBvdmURVN3tk1kv3gPJTLAoGBAJ3aLXfXM4YmiZdXOx4p
+6x2sH5tj0+GRiei6bil7B8nwKBWgZTGQLSjJyihygNoDViXaXL4vYqRBwn0ODNI/
+m0gd3A+qAVTcEQuZ5Tg+iZ1u8bVa3qWm7Y40Iai7Jnq70CMVLwsy8qNT2vfMcAI9
+r7VjqTqx4jFXJKd6lz5UQ3MvAoGBAIFLFOKkYG8b1AWsy8seJOVP/4O84nW8XK82
+uGjs94DMnJ5HQnGwEH/5Cp4n4f1iLBCrH0WjP7noGcRQPt8uMCA1L9qBvtGbY8i+
+ExxJRVbtFthIR2zt1RdkrPeYO7SbrWb2f6L1FvR23oZWTwk8MVIpoSDMXAuUMgg4
+2DP4Fx1HAoGBAJYaPfl6xpMtKiKxrATPGEjrESiUlGd27mpX8BUYUhuDQSc5KQn2
+YeF5btFkVSwNga78/9cHZR0nPBiYR12jM76Z4izuxZAUMR2A5qtfwako4ks/8ape
+tayjg0+4ERXI36cWKy4dXcAJgdIXitmum7eoS0mGPPdKR5NGeh+nDzoI
+-----END RSA PRIVATE KEY-----

diff --git a/puppetlabs/puppet/secure/keys/public_key.pkcs7.pem b/puppetlabs/puppet/secure/keys/public_key.pkcs7.pem
new file mode 100644 (file)
index 0000000..6130ecc
--- /dev/null
+++ b/puppetlabs/puppet/secure/keys/public_key.pkcs7.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC2TCCAcGgAwIBAgIBATANBgkqhkiG9w0BAQUFADAAMCAXDTE1MTEyMzE0NTA1
+NloYDzIwNjUxMTEwMTQ1MDU2WjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAxJWUYjSZKPxDwQy/janPlAcs+7YrY2IvLwyDea1OPdxJ1hoLNUYhNuH5
+c2VySkbEBhkHfPgNb76rG791xk8r8Q1XGSTOi6EsnIcGR+YE0EgbRJBlViPrrgx2
+CIfjD/9NOTWXe3hRtl8fSrGX79wat5aXUtGuna7w/tO0ybRDJGUcRz6d41Dthzrc
+41rBuv/5ICXMPtDCIynL9KNxSrpVMtdhOT5JhsfWqPboTQdQDDfm7wByuIeDTbHF
+EgXh0AzIZZtWnvcEkhicOQGXWce+5+lQhNc5CjuUsUT0iXW3Vl1MajPx6MOh4Ult
+40EucAiBQ74gXGnX/vIpXsswNCnIaQIDAQABo1wwWjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBT/oG2RIqwc3D3cLKPIcWl9qZlKbDAoBgNVHSMEITAfgBT/oG2R
+Iqwc3D3cLKPIcWl9qZlKbKEEpAIwAIIBATANBgkqhkiG9w0BAQUFAAOCAQEAMNNV
+k3/s/ZnJTYzj354P/HCLv/tImfGBM4CTdwrpnQWPep4eQTe+aX53uQVBa5CRhGX8
+G1B8KFs88aJ08NZI8Vq8z1JbjDcjLPdG//N1Hzxtfb7u9ZG6EYgs5FyurXp6Kqr3
+075SRzrj69KRZ4wcJx5PZy7CN7uTUxVG+MoZoALSoICnLB9yuMtrntDmkqqf0AGo
+URijDcNLPIJZZcfEu4DT2sdx1Qnc1K92jcnMaZZbDrVEo9m4uZJZ3NvbJQW/sHQ9
+SKTUG+MZt+hfqkWjOEf0stmYi8hro3jKnZaALqk17ICvzHmwrBCJYqAM3BUqkme5
+enOKBzldtebNmZmwTA==
+-----END CERTIFICATE-----