saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 429fc8ab2db4dfb2687f7785a48030b0661723b9..b2a1f0115fcf26bd6d93283e6c9d67b3610bf485 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -580,6 +580,11 @@ maybe chmod 0600 'ssh/ssh_host_rsa_key'
 maybe chmod 0644 'ssh/ssh_host_rsa_key.pub'
 maybe chmod 0600 'ssh/sshd_config'
 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..de0bedd
--- /dev/null
+++ b/ssl/apache2/server.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC1TCCAj6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbnRhIEJhcmJhcmExGzAZ
+BgNVBAoMEkFwYWNoZSBIVFRQIFNlcnZlcjEiMCAGA1UECwwZRm9yIFRlc3Rpbmcg
+UHVycG9zZXMgT25seTEVMBMGA1UEAwwMbG9jYWxob3N0IENBMR0wGwYJKoZIhvcN
+AQkBFg5yb290QGxvY2FsaG9zdDAeFw0xNjEyMjAxNTQzMDRaFw0xODEyMjAxNTQz
+MDRaMIGuMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UE
+BwwNU2FudGEgQmFyYmFyYTEbMBkGA1UECgwSQXBhY2hlIEhUVFAgU2VydmVyMSIw
+IAYDVQQLDBlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDDAlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDeKTXQAnJ4RnC/sZi9qEO2swBunm0ojylEymf0aas+
+/CpY0TZOxCsK282QspwuOeCt+nFxevCpqgdQbV5F6TEvuXShWThO8yStZ0mSEg2n
++ahshBNxAnXO/8eko9rzDik37h5BrLSDiMlCTbkV2uBu3Vqz+ADYqwLpL3LYg7uj
+GQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAJdBjRu8asMCuO4pvGeoqVBHEkw3Vj7P
+BI6mThNgjJnTCc7aUHkf2UDX4joTNpMImrGUH/mP9QYloRLgowWzvXSULkkbKDeZ
++1wAZsI38s6UUWH6B/xv/mjcKDhhPG2B9Gon8mIT/O7SudlQ2NZTYBWKfI2o7ENp
+vajgzrn3gxRH
+-----END CERTIFICATE-----

diff --git a/ssl/apache2/server.csr b/ssl/apache2/server.csr
new file mode 100644 (file)
index 0000000..2741152
--- /dev/null
+++ b/ssl/apache2/server.csr
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIB7zCCAVgCAQAwga4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlh
+MRYwFAYDVQQHDA1TYW50YSBCYXJiYXJhMRswGQYDVQQKDBJBcGFjaGUgSFRUUCBT
+ZXJ2ZXIxIjAgBgNVBAsMGUZvciBUZXN0aW5nIFB1cnBvc2VzIE9ubHkxEjAQBgNV
+BAMMCWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYOcm9vdEBsb2NhbGhvc3QwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN4pNdACcnhGcL+xmL2oQ7azAG6ebSiP
+KUTKZ/Rpqz78KljRNk7EKwrbzZCynC454K36cXF68KmqB1BtXkXpMS+5dKFZOE7z
+JK1nSZISDaf5qGyEE3ECdc7/x6Sj2vMOKTfuHkGstIOIyUJNuRXa4G7dWrP4ANir
+AukvctiDu6MZAgMBAAGgADANBgkqhkiG9w0BAQsFAAOBgQB97WSC61ZG+eM6nh/e
+mPEdttY76RHermj0cXxwBazq9os4ge8QTn5dyDyyj40iq5Ut25X82Ee5WqunyDZd
+J9QIiS+iUhwdFAESY/qc+3ET5aBPS66kN0zfM9Z97Gs9qzrbCdkrctylTtoDyh4/
+1s2XcrnO2sE0Z/B3k5WNQ4VvWA==
+-----END CERTIFICATE REQUEST-----

diff --git a/ssl/apache2/server.key b/ssl/apache2/server.key
new file mode 100644 (file)
index 0000000..61317fd
--- /dev/null
+++ b/ssl/apache2/server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDeKTXQAnJ4RnC/sZi9qEO2swBunm0ojylEymf0aas+/CpY0TZO
+xCsK282QspwuOeCt+nFxevCpqgdQbV5F6TEvuXShWThO8yStZ0mSEg2n+ahshBNx
+AnXO/8eko9rzDik37h5BrLSDiMlCTbkV2uBu3Vqz+ADYqwLpL3LYg7ujGQIDAQAB
+AoGAALtyCfV4Gx1gUcFsF3PuhTOh1LuA8JlIMYnZPdz7S4HZQeGupCPRYH/I9akh
+CqX2L5ybsxwMnwKIc6NopCJYnyYSMrHQuxlLEgE5qKruYcyQbA/JjWJvZtss+t6t
+sesb2+DglZtJX/++9wriZjtVGegLkI6nN0voQ0K0YqP02AECQQD86SbjM+KxyzcJ
+NlAUy1hi4Z/LIWQ1rW/HS4QdiGtOQnJhrhheOHeWqSnUahhteRQ/6DBDPbGO4Xql
+gSAi4o7hAkEA4N/ne3BgX/a9INggGtRoiqmdERtT7Qk2PWt7AOmGzARqmhyf+lu1
+SK/A8tvjq9LsOCXy2vT9e3fAWvTd5jMzOQJAIFytLzF6domsVy9t+9sxSiXYzqNN
+MVkqDnRpSWYlZPQ3sqwWTignlU28HoQc8BUoNC0/z7rbN48+pGLre8tFwQJBAL2j
+lS9AIcZL6ksceFan8lGdoFug1DH9psQ9M8odJhQ/VTcKFM+pL0RRE0K7tVBd29+u
+ARQtrubEom8SOV+8peECQQDW0+JcfLtUyeTtlp6FKIpkQI1HTMgRVZ9IXe/pO8LK
+sFsKcTybjDw/7yt5LzVBlstDfd+CzzafkmNG108lU7/k
+-----END RSA PRIVATE KEY-----

diff --git a/ssl/apache2/server.pem b/ssl/apache2/server.pem
new file mode 100644 (file)
index 0000000..802241b
--- /dev/null
+++ b/ssl/apache2/server.pem
@@ -0,0 +1,34 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDeKTXQAnJ4RnC/sZi9qEO2swBunm0ojylEymf0aas+/CpY0TZO
+xCsK282QspwuOeCt+nFxevCpqgdQbV5F6TEvuXShWThO8yStZ0mSEg2n+ahshBNx
+AnXO/8eko9rzDik37h5BrLSDiMlCTbkV2uBu3Vqz+ADYqwLpL3LYg7ujGQIDAQAB
+AoGAALtyCfV4Gx1gUcFsF3PuhTOh1LuA8JlIMYnZPdz7S4HZQeGupCPRYH/I9akh
+CqX2L5ybsxwMnwKIc6NopCJYnyYSMrHQuxlLEgE5qKruYcyQbA/JjWJvZtss+t6t
+sesb2+DglZtJX/++9wriZjtVGegLkI6nN0voQ0K0YqP02AECQQD86SbjM+KxyzcJ
+NlAUy1hi4Z/LIWQ1rW/HS4QdiGtOQnJhrhheOHeWqSnUahhteRQ/6DBDPbGO4Xql
+gSAi4o7hAkEA4N/ne3BgX/a9INggGtRoiqmdERtT7Qk2PWt7AOmGzARqmhyf+lu1
+SK/A8tvjq9LsOCXy2vT9e3fAWvTd5jMzOQJAIFytLzF6domsVy9t+9sxSiXYzqNN
+MVkqDnRpSWYlZPQ3sqwWTignlU28HoQc8BUoNC0/z7rbN48+pGLre8tFwQJBAL2j
+lS9AIcZL6ksceFan8lGdoFug1DH9psQ9M8odJhQ/VTcKFM+pL0RRE0K7tVBd29+u
+ARQtrubEom8SOV+8peECQQDW0+JcfLtUyeTtlp6FKIpkQI1HTMgRVZ9IXe/pO8LK
+sFsKcTybjDw/7yt5LzVBlstDfd+CzzafkmNG108lU7/k
+-----END RSA PRIVATE KEY-----
+
+-----BEGIN CERTIFICATE-----
+MIIC1TCCAj6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbnRhIEJhcmJhcmExGzAZ
+BgNVBAoMEkFwYWNoZSBIVFRQIFNlcnZlcjEiMCAGA1UECwwZRm9yIFRlc3Rpbmcg
+UHVycG9zZXMgT25seTEVMBMGA1UEAwwMbG9jYWxob3N0IENBMR0wGwYJKoZIhvcN
+AQkBFg5yb290QGxvY2FsaG9zdDAeFw0xNjEyMjAxNTQzMDRaFw0xODEyMjAxNTQz
+MDRaMIGuMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UE
+BwwNU2FudGEgQmFyYmFyYTEbMBkGA1UECgwSQXBhY2hlIEhUVFAgU2VydmVyMSIw
+IAYDVQQLDBlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDDAlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDeKTXQAnJ4RnC/sZi9qEO2swBunm0ojylEymf0aas+
+/CpY0TZOxCsK282QspwuOeCt+nFxevCpqgdQbV5F6TEvuXShWThO8yStZ0mSEg2n
++ahshBNxAnXO/8eko9rzDik37h5BrLSDiMlCTbkV2uBu3Vqz+ADYqwLpL3LYg7uj
+GQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAJdBjRu8asMCuO4pvGeoqVBHEkw3Vj7P
+BI6mThNgjJnTCc7aUHkf2UDX4joTNpMImrGUH/mP9QYloRLgowWzvXSULkkbKDeZ
++1wAZsI38s6UUWH6B/xv/mjcKDhhPG2B9Gon8mIT/O7SudlQ2NZTYBWKfI2o7ENp
+vajgzrn3gxRH
+-----END CERTIFICATE-----