saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 7df11dbbb821ae68a36581d6d1217f06379eee79..7927640075ee8e6fb4d6d81ed529f9a17f401dfa 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -863,6 +863,11 @@ maybe chmod 0644 './ssh/ssh_host_rsa_key.pub'
 maybe chmod 0600 './ssh/sshd_config'
 maybe chmod 0600 './ssh/sshd_config.orig'
 maybe chmod 0755 './ssl'
+maybe chmod 0755 './ssl/apache2'
+maybe chmod 0444 './ssl/apache2/server.crt'
+maybe chmod 0444 './ssl/apache2/server.csr'
+maybe chmod 0400 './ssl/apache2/server.key'
+maybe chmod 0400 './ssl/apache2/server.pem'
 maybe chmod 0755 './ssl/certs'
 maybe chmod 0644 './ssl/certs/README.RootCerts'
 maybe chmod 0644 './ssl/certs/ca-certificates.crt'

diff --git a/ssl/apache2/server.crt b/ssl/apache2/server.crt
new file mode 100644 (file)
index 0000000..67f0336
--- /dev/null
+++ b/ssl/apache2/server.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC1TCCAj6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBsTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRhIEJhcmJhcmExGzAZ
+BgNVBAoTEkFwYWNoZSBIVFRQIFNlcnZlcjEiMCAGA1UECxMZRm9yIFRlc3Rpbmcg
+UHVycG9zZXMgT25seTEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR0wGwYJKoZIhvcN
+AQkBFg5yb290QGxvY2FsaG9zdDAeFw0xMjAxMTYxMzM1MDJaFw0xNDAxMTUxMzM1
+MDJaMIGuMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNU2FudGEgQmFyYmFyYTEbMBkGA1UEChMSQXBhY2hlIEhUVFAgU2VydmVyMSIw
+IAYDVQQLExlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDEwlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDHlC6cSFk3W3ALMbhx5A2YMtdFh1LaO663GJ8ID0W9
+nkV8OPQboi6V9GV0jZz7ASrz5gJJY8ge5Jt/WT9l/BAWYt3VTdQqMHt1y2ESVXuA
+XGVZf9f7yB/gzcVrAzAOTzPYyChETJpjELKDDKVxGHbKVwEQFkgi9/ivXPuV1/hp
+fwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAMloM7tLOELtpfG+OGCrMm7VOvwiNzpn
+bUnBo0vR66oyAyRO7jVpL3ITAGrEYg9p57S+HWvoqkLa1t57XAk1PIGzutmIJo0n
+KN4xV5qck9lCce9bfFso91ImQbTEExPFNItkgqa+SQvMnhTfrA20/9Wqwb1zk57k
+6h71C+je1x6x
+-----END CERTIFICATE-----

diff --git a/ssl/apache2/server.csr b/ssl/apache2/server.csr
new file mode 100644 (file)
index 0000000..4c8170d
--- /dev/null
+++ b/ssl/apache2/server.csr
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIB7zCCAVgCAQAwga4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRYwFAYDVQQHEw1TYW50YSBCYXJiYXJhMRswGQYDVQQKExJBcGFjaGUgSFRUUCBT
+ZXJ2ZXIxIjAgBgNVBAsTGUZvciBUZXN0aW5nIFB1cnBvc2VzIE9ubHkxEjAQBgNV
+BAMTCWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYOcm9vdEBsb2NhbGhvc3QwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMeULpxIWTdbcAsxuHHkDZgy10WHUto7
+rrcYnwgPRb2eRXw49BuiLpX0ZXSNnPsBKvPmAkljyB7km39ZP2X8EBZi3dVN1Cow
+e3XLYRJVe4BcZVl/1/vIH+DNxWsDMA5PM9jIKERMmmMQsoMMpXEYdspXARAWSCL3
++K9c+5XX+Gl/AgMBAAGgADANBgkqhkiG9w0BAQUFAAOBgQC9TSpwkv/hDnNHbJft
+1k0gTn8hWvmIDDmbC5ec3NsEEzztbmkmMfjuHvhu46pwCz1zJMsdlSGsQeD3kozZ
+V61uiaQNWdg0gESJI5i4jZEVRVf39maXDjEXw8xnZ4mjb2FUm3HxJV1QJfKos3HC
+SK5Gh+keETggmnYDKv/Gya0tcQ==
+-----END CERTIFICATE REQUEST-----

diff --git a/ssl/apache2/server.key b/ssl/apache2/server.key
new file mode 100644 (file)
index 0000000..6570947
--- /dev/null
+++ b/ssl/apache2/server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDHlC6cSFk3W3ALMbhx5A2YMtdFh1LaO663GJ8ID0W9nkV8OPQb
+oi6V9GV0jZz7ASrz5gJJY8ge5Jt/WT9l/BAWYt3VTdQqMHt1y2ESVXuAXGVZf9f7
+yB/gzcVrAzAOTzPYyChETJpjELKDDKVxGHbKVwEQFkgi9/ivXPuV1/hpfwIDAQAB
+AoGBAIngEe8/f/rhPV9OYwizLr0VamiLGy7Oil3NMZhkzJ45Z/FwextYCGzp4OkL
+KAazgNPr82p193t4HQB2THkNEKLdfzG9bC+fzoMUu6HM23Q1L2VgE3mio0lqeMpd
+sYh5NpG3+d4+G+M622l3VFnO5iYsL3XXdg36XdrquMVd/IjpAkEA8W84MAbGt3C+
+0aZYadC+LH9d7WbSaWFxdYRveHSJuFF2c/Rc+tlNBdMuEDzOZvGGsauBbxgsMVHW
+EdTbNxTEewJBANOeiGsGIpyrRp9bmD8J664/KOIZ5Ox50y9IB1+rbi7FU6zqexcB
+Ra6Cx64Rp3P2SdAVQvtHelU/1ibyxsfwSc0CQFywHhoR/+gc2KUT/41gHiJnI2Ao
+wU7DohNDrKfJ1bV1UMxjW+7RzcgWsvB456SNxPAgr6g+13h3un9OAHq89lECQFcW
+6Dd7V+U4C6FrlZVj5M1aCt46H98+J65Oq1Iw//BZnx0Lhsqp6F5wTfMSKuLrWec7
+yMwW136b/esbgLkp54UCQEWCBfnmnxgi6/As1mGebk/iiU/ewfdJaHdnTV8iNjoK
+9MZcNmlEdWJYduY3uU12i3KZHoqS9ihq8JlLLbPxwTE=
+-----END RSA PRIVATE KEY-----

diff --git a/ssl/apache2/server.pem b/ssl/apache2/server.pem
new file mode 100644 (file)
index 0000000..557859f
--- /dev/null
+++ b/ssl/apache2/server.pem
@@ -0,0 +1,34 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDHlC6cSFk3W3ALMbhx5A2YMtdFh1LaO663GJ8ID0W9nkV8OPQb
+oi6V9GV0jZz7ASrz5gJJY8ge5Jt/WT9l/BAWYt3VTdQqMHt1y2ESVXuAXGVZf9f7
+yB/gzcVrAzAOTzPYyChETJpjELKDDKVxGHbKVwEQFkgi9/ivXPuV1/hpfwIDAQAB
+AoGBAIngEe8/f/rhPV9OYwizLr0VamiLGy7Oil3NMZhkzJ45Z/FwextYCGzp4OkL
+KAazgNPr82p193t4HQB2THkNEKLdfzG9bC+fzoMUu6HM23Q1L2VgE3mio0lqeMpd
+sYh5NpG3+d4+G+M622l3VFnO5iYsL3XXdg36XdrquMVd/IjpAkEA8W84MAbGt3C+
+0aZYadC+LH9d7WbSaWFxdYRveHSJuFF2c/Rc+tlNBdMuEDzOZvGGsauBbxgsMVHW
+EdTbNxTEewJBANOeiGsGIpyrRp9bmD8J664/KOIZ5Ox50y9IB1+rbi7FU6zqexcB
+Ra6Cx64Rp3P2SdAVQvtHelU/1ibyxsfwSc0CQFywHhoR/+gc2KUT/41gHiJnI2Ao
+wU7DohNDrKfJ1bV1UMxjW+7RzcgWsvB456SNxPAgr6g+13h3un9OAHq89lECQFcW
+6Dd7V+U4C6FrlZVj5M1aCt46H98+J65Oq1Iw//BZnx0Lhsqp6F5wTfMSKuLrWec7
+yMwW136b/esbgLkp54UCQEWCBfnmnxgi6/As1mGebk/iiU/ewfdJaHdnTV8iNjoK
+9MZcNmlEdWJYduY3uU12i3KZHoqS9ihq8JlLLbPxwTE=
+-----END RSA PRIVATE KEY-----
+
+-----BEGIN CERTIFICATE-----
+MIIC1TCCAj6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBsTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRhIEJhcmJhcmExGzAZ
+BgNVBAoTEkFwYWNoZSBIVFRQIFNlcnZlcjEiMCAGA1UECxMZRm9yIFRlc3Rpbmcg
+UHVycG9zZXMgT25seTEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR0wGwYJKoZIhvcN
+AQkBFg5yb290QGxvY2FsaG9zdDAeFw0xMjAxMTYxMzM1MDJaFw0xNDAxMTUxMzM1
+MDJaMIGuMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNU2FudGEgQmFyYmFyYTEbMBkGA1UEChMSQXBhY2hlIEhUVFAgU2VydmVyMSIw
+IAYDVQQLExlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDEwlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDHlC6cSFk3W3ALMbhx5A2YMtdFh1LaO663GJ8ID0W9
+nkV8OPQboi6V9GV0jZz7ASrz5gJJY8ge5Jt/WT9l/BAWYt3VTdQqMHt1y2ESVXuA
+XGVZf9f7yB/gzcVrAzAOTzPYyChETJpjELKDDKVxGHbKVwEQFkgi9/ivXPuV1/hp
+fwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAMloM7tLOELtpfG+OGCrMm7VOvwiNzpn
+bUnBo0vR66oyAyRO7jVpL3ITAGrEYg9p57S+HWvoqkLa1t57XAk1PIGzutmIJo0n
+KN4xV5qck9lCce9bfFso91ImQbTEExPFNItkgqa+SQvMnhTfrA20/9Wqwb1zk57k
+6h71C+je1x6x
+-----END CERTIFICATE-----