saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index d04d6f0722697e48aa1b0353464dd479ba29e005..1bf64489ba89627144f435e426d7cd556b28a6ec 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -390,9 +390,23 @@ maybe chmod 0444 'openldap/schema/ppolicy.schema'
 maybe chmod 0644 'openldap/schema/rfc2307bis.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 0600 'openldap/slapd.ldif'
 maybe chmod 0600 'openldap/slapd.ldif.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 0644 'os-release'
 maybe chmod 0755 'pam.d'
 maybe chmod 0644 'pam.d/chage'

diff --git a/openldap/ssl/ldap.crt b/openldap/ssl/ldap.crt
new file mode 100644 (file)
index 0000000..dacd0e8
--- /dev/null
+++ b/openldap/ssl/ldap.crt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICxTCCAi6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBqTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbnRhIEJhcmJhcmExEzAR
+BgNVBAoMClNTTCBTZXJ2ZXIxIjAgBgNVBAsMGUZvciBUZXN0aW5nIFB1cnBvc2Vz
+IE9ubHkxFTATBgNVBAMMDGxvY2FsaG9zdCBDQTEdMBsGCSqGSIb3DQEJARYOcm9v
+dEBsb2NhbGhvc3QwHhcNMTYxMjIwMTUzMjMxWhcNMTgxMjIwMTUzMjMxWjCBpjEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbnRh
+IEJhcmJhcmExEzARBgNVBAoMClNTTCBTZXJ2ZXIxIjAgBgNVBAsMGUZvciBUZXN0
+aW5nIFB1cnBvc2VzIE9ubHkxEjAQBgNVBAMMCWxvY2FsaG9zdDEdMBsGCSqGSIb3
+DQEJARYOcm9vdEBsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+AM5VyrvEGeDIWYLINxdO01Caf0nYMvZ73ki5P9Sxg2DodXlf7pPIh89KOlnFnYy0
+iYRACj4W3Bz9labyRkRHlfMi40lp12MohPzWBOM1ivB8ACaEx6FDLBlbjAY9bFYq
+siKK+nU/KzIFuLQqQxQF5gB8XADPZ2IBwf0kYyakFcZpAgMBAAEwDQYJKoZIhvcN
+AQELBQADgYEAYw7fJ5p+oGjxSLXttmPRXVFv7+4HP5vo3l1FVKBFO/dzFiMB08tp
+0/lG1cWgUTR0kruB6fqFYa0q0wugEi8HtTyR1KsCcd29qToOippL3g1CX8JPCAd1
+UOTtwZriZcfixgwdq0wT+uGopmE0z3t56r8iJxUJ1+THbh+2bN7YxX0=
+-----END CERTIFICATE-----

diff --git a/openldap/ssl/ldap.csr b/openldap/ssl/ldap.csr
new file mode 100644 (file)
index 0000000..938af4f
--- /dev/null
+++ b/openldap/ssl/ldap.csr
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIB5zCCAVACAQAwgaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlh
+MRYwFAYDVQQHDA1TYW50YSBCYXJiYXJhMRMwEQYDVQQKDApTU0wgU2VydmVyMSIw
+IAYDVQQLDBlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDDAlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDOVcq7xBngyFmCyDcXTtNQmn9J2DL2e95IuT/UsYNg
+6HV5X+6TyIfPSjpZxZ2MtImEQAo+Ftwc/ZWm8kZER5XzIuNJaddjKIT81gTjNYrw
+fAAmhMehQywZW4wGPWxWKrIiivp1PysyBbi0KkMUBeYAfFwAz2diAcH9JGMmpBXG
+aQIDAQABoAAwDQYJKoZIhvcNAQELBQADgYEAbnUBwoYXHmJIV9BG78vES30A3JEZ
+0ZTjFr4I3ZT6Erccy/QQUnlUhbI94AWaTHnLJZ1q09Uiq+wM/ggrlr7CAXCkDbZi
+MBxtGl/eJgapkunN1Opeu6hgUccqxZI+qiEU+jzOhuOjBLhV6nc1BiCAorgu7s1h
+6s0Nt0lTRRFd7bU=
+-----END CERTIFICATE REQUEST-----

diff --git a/openldap/ssl/ldap.key b/openldap/ssl/ldap.key
new file mode 100644 (file)
index 0000000..178a817
--- /dev/null
+++ b/openldap/ssl/ldap.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDOVcq7xBngyFmCyDcXTtNQmn9J2DL2e95IuT/UsYNg6HV5X+6T
+yIfPSjpZxZ2MtImEQAo+Ftwc/ZWm8kZER5XzIuNJaddjKIT81gTjNYrwfAAmhMeh
+QywZW4wGPWxWKrIiivp1PysyBbi0KkMUBeYAfFwAz2diAcH9JGMmpBXGaQIDAQAB
+AoGBAMG5BNYTwOQt1vSWPDsy8+26kIXpabfIBqQq4YY1gA8NUbY6Xon7/Z6ep3g/
+tLM1keNMKRGwbsr9P3N2Boj22Q21ehDdxxFFxAvJEv0eKXhRy3qJNivU6T+OXB/j
+pb2qXPuMF20jbbfBhce+rewadX4wniTQzZV9UIrKvA7hvkZxAkEA6MY7jzOyBigd
+omvTvh79SL78w0tOMChIw7dF+W3e3FTOSfN5oiXbDQvUhKT+9oaYq53vHHHTXSPc
+IZN2oWu39QJBAOLsOImOPXsxQDhIl192imeB1SYpqdZL0ZferU2Pf/r27U9ynCjV
+0EL2iMPvvcvJdmBvwzHZSQz6ypAYJPJFcCUCQELHA7UcPnkXrxC2YENNfpoM+FRK
+WT7lf6JuBGv/Ag0xYxDCAWXr+EBw4WHAN8ifalLpdvwxB1LUA8W6GTFLxrUCQQCW
+5XYDIq8HiIyn4L2oIW+PvOo8YmApvGk3kD+138K+5AySVCg7j1LZ9I6lnHqdVO5+
+2lL2hwLouqyQfT20TTBxAkANviIXTWJEPofeGO1jy0uEpVybc76CV4h3qKpYFROz
+wY44/Av3EQlsF8U09A/NOTRCpJ1hnmv3FavV9KUAN1of
+-----END RSA PRIVATE KEY-----

diff --git a/openldap/ssl/ldap.pem b/openldap/ssl/ldap.pem
new file mode 100644 (file)
index 0000000..c4b6316
--- /dev/null
+++ b/openldap/ssl/ldap.pem
@@ -0,0 +1,33 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDOVcq7xBngyFmCyDcXTtNQmn9J2DL2e95IuT/UsYNg6HV5X+6T
+yIfPSjpZxZ2MtImEQAo+Ftwc/ZWm8kZER5XzIuNJaddjKIT81gTjNYrwfAAmhMeh
+QywZW4wGPWxWKrIiivp1PysyBbi0KkMUBeYAfFwAz2diAcH9JGMmpBXGaQIDAQAB
+AoGBAMG5BNYTwOQt1vSWPDsy8+26kIXpabfIBqQq4YY1gA8NUbY6Xon7/Z6ep3g/
+tLM1keNMKRGwbsr9P3N2Boj22Q21ehDdxxFFxAvJEv0eKXhRy3qJNivU6T+OXB/j
+pb2qXPuMF20jbbfBhce+rewadX4wniTQzZV9UIrKvA7hvkZxAkEA6MY7jzOyBigd
+omvTvh79SL78w0tOMChIw7dF+W3e3FTOSfN5oiXbDQvUhKT+9oaYq53vHHHTXSPc
+IZN2oWu39QJBAOLsOImOPXsxQDhIl192imeB1SYpqdZL0ZferU2Pf/r27U9ynCjV
+0EL2iMPvvcvJdmBvwzHZSQz6ypAYJPJFcCUCQELHA7UcPnkXrxC2YENNfpoM+FRK
+WT7lf6JuBGv/Ag0xYxDCAWXr+EBw4WHAN8ifalLpdvwxB1LUA8W6GTFLxrUCQQCW
+5XYDIq8HiIyn4L2oIW+PvOo8YmApvGk3kD+138K+5AySVCg7j1LZ9I6lnHqdVO5+
+2lL2hwLouqyQfT20TTBxAkANviIXTWJEPofeGO1jy0uEpVybc76CV4h3qKpYFROz
+wY44/Av3EQlsF8U09A/NOTRCpJ1hnmv3FavV9KUAN1of
+-----END RSA PRIVATE KEY-----
+
+-----BEGIN CERTIFICATE-----
+MIICxTCCAi6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBqTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbnRhIEJhcmJhcmExEzAR
+BgNVBAoMClNTTCBTZXJ2ZXIxIjAgBgNVBAsMGUZvciBUZXN0aW5nIFB1cnBvc2Vz
+IE9ubHkxFTATBgNVBAMMDGxvY2FsaG9zdCBDQTEdMBsGCSqGSIb3DQEJARYOcm9v
+dEBsb2NhbGhvc3QwHhcNMTYxMjIwMTUzMjMxWhcNMTgxMjIwMTUzMjMxWjCBpjEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbnRh
+IEJhcmJhcmExEzARBgNVBAoMClNTTCBTZXJ2ZXIxIjAgBgNVBAsMGUZvciBUZXN0
+aW5nIFB1cnBvc2VzIE9ubHkxEjAQBgNVBAMMCWxvY2FsaG9zdDEdMBsGCSqGSIb3
+DQEJARYOcm9vdEBsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+AM5VyrvEGeDIWYLINxdO01Caf0nYMvZ73ki5P9Sxg2DodXlf7pPIh89KOlnFnYy0
+iYRACj4W3Bz9labyRkRHlfMi40lp12MohPzWBOM1ivB8ACaEx6FDLBlbjAY9bFYq
+siKK+nU/KzIFuLQqQxQF5gB8XADPZ2IBwf0kYyakFcZpAgMBAAEwDQYJKoZIhvcN
+AQELBQADgYEAYw7fJ5p+oGjxSLXttmPRXVFv7+4HP5vo3l1FVKBFO/dzFiMB08tp
+0/lG1cWgUTR0kruB6fqFYa0q0wugEi8HtTyR1KsCcd29qToOippL3g1CX8JPCAd1
+UOTtwZriZcfixgwdq0wT+uGopmE0z3t56r8iJxUJ1+THbh+2bN7YxX0=
+-----END CERTIFICATE-----