saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 8a4401b7922382b5b2dc1c2fa650d94eb6a3300f..c79ad578b53015cb9c8f20231bdc165afb8c80c4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -578,7 +578,21 @@ maybe chmod 0444 './openldap/schema/ppolicy.schema'
 maybe chmod 0644 './openldap/schema/samba.schema'
 maybe chgrp ldap './openldap/slapd.conf'
 maybe chmod 0640 './openldap/slapd.conf'
-maybe chmod 0600 './openldap/slapd.conf.default'
+maybe chgrp ldap './openldap/slapd.conf.default'
+maybe chmod 0640 './openldap/slapd.conf.default'
+maybe chmod 0755 './openldap/ssl'
+maybe chown ldap './openldap/ssl/ldap.crt'
+maybe chgrp ldap './openldap/ssl/ldap.crt'
+maybe chmod 0444 './openldap/ssl/ldap.crt'
+maybe chown ldap './openldap/ssl/ldap.csr'
+maybe chgrp ldap './openldap/ssl/ldap.csr'
+maybe chmod 0444 './openldap/ssl/ldap.csr'
+maybe chown ldap './openldap/ssl/ldap.key'
+maybe chgrp ldap './openldap/ssl/ldap.key'
+maybe chmod 0400 './openldap/ssl/ldap.key'
+maybe chown ldap './openldap/ssl/ldap.pem'
+maybe chgrp ldap './openldap/ssl/ldap.pem'
+maybe chmod 0400 './openldap/ssl/ldap.pem'
 maybe chmod 0755 './pam.d'
 maybe chmod 0644 './pam.d/chage'
 maybe chmod 0644 './pam.d/chfn'

diff --git a/openldap/ssl/ldap.crt b/openldap/ssl/ldap.crt
new file mode 100644 (file)
index 0000000..b6bfaa8
--- /dev/null
+++ b/openldap/ssl/ldap.crt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICxTCCAi6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRhIEJhcmJhcmExEzAR
+BgNVBAoTClNTTCBTZXJ2ZXIxIjAgBgNVBAsTGUZvciBUZXN0aW5nIFB1cnBvc2Vz
+IE9ubHkxFTATBgNVBAMTDGxvY2FsaG9zdCBDQTEdMBsGCSqGSIb3DQEJARYOcm9v
+dEBsb2NhbGhvc3QwHhcNMTIwMTE2MTMxNjI2WhcNMTQwMTE1MTMxNjI2WjCBpjEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRh
+IEJhcmJhcmExEzARBgNVBAoTClNTTCBTZXJ2ZXIxIjAgBgNVBAsTGUZvciBUZXN0
+aW5nIFB1cnBvc2VzIE9ubHkxEjAQBgNVBAMTCWxvY2FsaG9zdDEdMBsGCSqGSIb3
+DQEJARYOcm9vdEBsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ANH7tTO2ieI5iuhDuOjEaGKiUpL3XJ2k9IZWkRnDT5a5kTa4xIi1kA8i+t/19QfR
+z1Fx7HpMVJgirpILVwpcPLVn5D/bjaK+kn0V6K9A/QLma/pnYrECt8OHAOFzDpBf
+wvnGfizZe5hXr+ojtPBjEPM568jIYLh4+jAJFV7NoFktAgMBAAEwDQYJKoZIhvcN
+AQEFBQADgYEAHI00iER7tzTmWZfcK5pv05VGZAvdKC0cKo1ogyaNJQPic3Hvo/u/
+kZ6osiVq045GzlgMTrH9u+Zlwp16iYth3yACtvZgzS2tUjRFX4tHVscJHo45ecFh
+HjbrdN0cvCQVcafEm8qnzMFqg7naG0X5kpLoZ//p6CSKdLhF1mWZXI4=
+-----END CERTIFICATE-----

diff --git a/openldap/ssl/ldap.csr b/openldap/ssl/ldap.csr
new file mode 100644 (file)
index 0000000..70a6cb9
--- /dev/null
+++ b/openldap/ssl/ldap.csr
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIB5zCCAVACAQAwgaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRYwFAYDVQQHEw1TYW50YSBCYXJiYXJhMRMwEQYDVQQKEwpTU0wgU2VydmVyMSIw
+IAYDVQQLExlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDEwlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDR+7UztoniOYroQ7joxGhiolKS91ydpPSGVpEZw0+W
+uZE2uMSItZAPIvrf9fUH0c9Rcex6TFSYIq6SC1cKXDy1Z+Q/242ivpJ9FeivQP0C
+5mv6Z2KxArfDhwDhcw6QX8L5xn4s2XuYV6/qI7TwYxDzOevIyGC4ePowCRVezaBZ
+LQIDAQABoAAwDQYJKoZIhvcNAQEFBQADgYEAGwLf14QiOJ3NiVi1rFDR+wgxiYTR
+ZCEmywYEbcIYcNj6IVS5fOaFUdq4/sBQcaB6gPtqsuORMsnqxBMVk22LtUDljOuk
+I7r7EtsdZq4OQ5Tr39WREJakXM9ug2FHhizlSVN2l5je9pFBVgiD+MuXk3Vkfsu5
+MCOJlGIdAJU5kAU=
+-----END CERTIFICATE REQUEST-----

diff --git a/openldap/ssl/ldap.key b/openldap/ssl/ldap.key
new file mode 100644 (file)
index 0000000..a0c6384
--- /dev/null
+++ b/openldap/ssl/ldap.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDR+7UztoniOYroQ7joxGhiolKS91ydpPSGVpEZw0+WuZE2uMSI
+tZAPIvrf9fUH0c9Rcex6TFSYIq6SC1cKXDy1Z+Q/242ivpJ9FeivQP0C5mv6Z2Kx
+ArfDhwDhcw6QX8L5xn4s2XuYV6/qI7TwYxDzOevIyGC4ePowCRVezaBZLQIDAQAB
+AoGAY30Z5m2HOMtAuDlWA9sDBjCYZQ+ULxD31ipvx0AVlnlHhyDV5Vv47GMLcE9t
+kA3lZ1ZNz8gYkJhmE8YRsFPxYrnn21I5ezZA15oLo7wBhOyzVUwt7D6mDKmq7BI4
+dy1AtHiVEFxV5/r446jAdJShNEDeI4EplmjIplyJ4MauyqECQQDzUR+bfSgG3Dz8
+wZxrgENFeifHptHMa7zuBolPRi55j5U4LKgD6RXWGWUCsk5i8309xcMXxlT37fEJ
+O+0fCeb1AkEA3O3Fu7NWb447luVRNvn3c00KOHx1wIFflTJ1YcCSVGoKJPUhqGo7
+mKQC1ffHwnKvbH48PcGk8AjqA3d9Ej4WWQJASQkYy7uNwEFrrRMQuNQPXVOFjVBt
+uUa9t1UO8lTGroaC7BG7fTEB9Po6b8zF6r3b4ibyoLhP2Pv7ViI+0wpN4QJBAMkw
+91shzFs26elW2Aj6xnAH/oDGRu2SY5sZInBs0FVzY92YJpiadb9hzPtR9GaNzlc8
+9ls/F5dIZuPVUt7kD7ECQB+QD8ZGVdXbOhgFv8lbSvyfKi5S78BGH/QuzzvIAILm
+4XhuQ5WWRHmPbjm3stmlI381/o3MeblzWZXUYhggFps=
+-----END RSA PRIVATE KEY-----

diff --git a/openldap/ssl/ldap.pem b/openldap/ssl/ldap.pem
new file mode 100644 (file)
index 0000000..2838371
--- /dev/null
+++ b/openldap/ssl/ldap.pem
@@ -0,0 +1,33 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDR+7UztoniOYroQ7joxGhiolKS91ydpPSGVpEZw0+WuZE2uMSI
+tZAPIvrf9fUH0c9Rcex6TFSYIq6SC1cKXDy1Z+Q/242ivpJ9FeivQP0C5mv6Z2Kx
+ArfDhwDhcw6QX8L5xn4s2XuYV6/qI7TwYxDzOevIyGC4ePowCRVezaBZLQIDAQAB
+AoGAY30Z5m2HOMtAuDlWA9sDBjCYZQ+ULxD31ipvx0AVlnlHhyDV5Vv47GMLcE9t
+kA3lZ1ZNz8gYkJhmE8YRsFPxYrnn21I5ezZA15oLo7wBhOyzVUwt7D6mDKmq7BI4
+dy1AtHiVEFxV5/r446jAdJShNEDeI4EplmjIplyJ4MauyqECQQDzUR+bfSgG3Dz8
+wZxrgENFeifHptHMa7zuBolPRi55j5U4LKgD6RXWGWUCsk5i8309xcMXxlT37fEJ
+O+0fCeb1AkEA3O3Fu7NWb447luVRNvn3c00KOHx1wIFflTJ1YcCSVGoKJPUhqGo7
+mKQC1ffHwnKvbH48PcGk8AjqA3d9Ej4WWQJASQkYy7uNwEFrrRMQuNQPXVOFjVBt
+uUa9t1UO8lTGroaC7BG7fTEB9Po6b8zF6r3b4ibyoLhP2Pv7ViI+0wpN4QJBAMkw
+91shzFs26elW2Aj6xnAH/oDGRu2SY5sZInBs0FVzY92YJpiadb9hzPtR9GaNzlc8
+9ls/F5dIZuPVUt7kD7ECQB+QD8ZGVdXbOhgFv8lbSvyfKi5S78BGH/QuzzvIAILm
+4XhuQ5WWRHmPbjm3stmlI381/o3MeblzWZXUYhggFps=
+-----END RSA PRIVATE KEY-----
+
+-----BEGIN CERTIFICATE-----
+MIICxTCCAi6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRhIEJhcmJhcmExEzAR
+BgNVBAoTClNTTCBTZXJ2ZXIxIjAgBgNVBAsTGUZvciBUZXN0aW5nIFB1cnBvc2Vz
+IE9ubHkxFTATBgNVBAMTDGxvY2FsaG9zdCBDQTEdMBsGCSqGSIb3DQEJARYOcm9v
+dEBsb2NhbGhvc3QwHhcNMTIwMTE2MTMxNjI2WhcNMTQwMTE1MTMxNjI2WjCBpjEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRh
+IEJhcmJhcmExEzARBgNVBAoTClNTTCBTZXJ2ZXIxIjAgBgNVBAsTGUZvciBUZXN0
+aW5nIFB1cnBvc2VzIE9ubHkxEjAQBgNVBAMTCWxvY2FsaG9zdDEdMBsGCSqGSIb3
+DQEJARYOcm9vdEBsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ANH7tTO2ieI5iuhDuOjEaGKiUpL3XJ2k9IZWkRnDT5a5kTa4xIi1kA8i+t/19QfR
+z1Fx7HpMVJgirpILVwpcPLVn5D/bjaK+kn0V6K9A/QLma/pnYrECt8OHAOFzDpBf
+wvnGfizZe5hXr+ojtPBjEPM568jIYLh4+jAJFV7NoFktAgMBAAEwDQYJKoZIhvcN
+AQEFBQADgYEAHI00iER7tzTmWZfcK5pv05VGZAvdKC0cKo1ogyaNJQPic3Hvo/u/
+kZ6osiVq045GzlgMTrH9u+Zlwp16iYth3yACtvZgzS2tUjRFX4tHVscJHo45ecFh
+HjbrdN0cvCQVcafEm8qnzMFqg7naG0X5kpLoZ//p6CSKdLhF1mWZXI4=
+-----END CERTIFICATE-----