saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index e4bc5b7d2b8efe148f4ee10ca51e88f30d4cf637..078a6620d69eac12c94ddf7430afdb47e673cf68 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1440,6 +1440,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..c4b5a9a
--- /dev/null
+++ b/ssl/apache2/server.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC1TCCAj6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBsTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRhIEJhcmJhcmExGzAZ
+BgNVBAoTEkFwYWNoZSBIVFRQIFNlcnZlcjEiMCAGA1UECxMZRm9yIFRlc3Rpbmcg
+UHVycG9zZXMgT25seTEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR0wGwYJKoZIhvcN
+AQkBFg5yb290QGxvY2FsaG9zdDAeFw0xMjAyMjEwNjIwNTVaFw0xNDAyMjAwNjIw
+NTVaMIGuMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNU2FudGEgQmFyYmFyYTEbMBkGA1UEChMSQXBhY2hlIEhUVFAgU2VydmVyMSIw
+IAYDVQQLExlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDEwlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQClMWB091l5avRonKEbCSFTQzKpqQy2z4yLl0nV68R3
+wP0RbIR2kqGmKFP73y7j3Fw3/KWP2WzoeOMTqxPOLMAj1pwIRJU3RxMrHlIRwoYk
+8oCGXcttrYJXs5XS9T37Evq+Uo/u/ABsM0QuEn3NFOL777a8wfGh0RTGtUx4fj73
+xQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAAvR5LaxfHzSf4AL537J/e32TktA5uJc
+hpfBIPB0HmUh3tjdggFj+CfMSKW+HrW9xs1cpW8jhSxuixpzdD6AZrD4sn4IJC8B
+hSfbQ9r5u6U3jh0zgK/mqsgH3nqJbX1ztzL3gj7Q6lvWQpIiCAy2Cup5y2/0ecNz
+cvt+PnhuWQtJ
+-----END CERTIFICATE-----

diff --git a/ssl/apache2/server.csr b/ssl/apache2/server.csr
new file mode 100644 (file)
index 0000000..dd1aad3
--- /dev/null
+++ b/ssl/apache2/server.csr
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIB7zCCAVgCAQAwga4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRYwFAYDVQQHEw1TYW50YSBCYXJiYXJhMRswGQYDVQQKExJBcGFjaGUgSFRUUCBT
+ZXJ2ZXIxIjAgBgNVBAsTGUZvciBUZXN0aW5nIFB1cnBvc2VzIE9ubHkxEjAQBgNV
+BAMTCWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYOcm9vdEBsb2NhbGhvc3QwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKUxYHT3WXlq9GicoRsJIVNDMqmpDLbP
+jIuXSdXrxHfA/RFshHaSoaYoU/vfLuPcXDf8pY/ZbOh44xOrE84swCPWnAhElTdH
+EyseUhHChiTygIZdy22tglezldL1PfsS+r5Sj+78AGwzRC4Sfc0U4vvvtrzB8aHR
+FMa1THh+PvfFAgMBAAGgADANBgkqhkiG9w0BAQUFAAOBgQBjVITrCQml2w5sJgkt
+dxput5n65pgtaDWIbhls9+e+yE9BoTWXPPhB3v0JeCjSYqbAzpNidQv2PyTtBCA4
+dRVFdrOcnQ1cSgFGy7ByfIRELb5N/KRQLOC7lOVcT4VuXWHj/OrsMjbzuFZ89qrr
+RuCQ8F4zxoXI5YL3xlXOoKSZoA==
+-----END CERTIFICATE REQUEST-----

diff --git a/ssl/apache2/server.key b/ssl/apache2/server.key
new file mode 100644 (file)
index 0000000..8f3a08e
--- /dev/null
+++ b/ssl/apache2/server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQClMWB091l5avRonKEbCSFTQzKpqQy2z4yLl0nV68R3wP0RbIR2
+kqGmKFP73y7j3Fw3/KWP2WzoeOMTqxPOLMAj1pwIRJU3RxMrHlIRwoYk8oCGXctt
+rYJXs5XS9T37Evq+Uo/u/ABsM0QuEn3NFOL777a8wfGh0RTGtUx4fj73xQIDAQAB
+AoGAFisxMaE8LbIvyJY0fKdWBJGBDAm2vhXOW7Fa5E12mUeZ7qusfykgbmb9FlEW
+PtgEvDK4mTxphC0s9CfCSanxwuZI++iwZG9t+hVp+d9u31ToyWfOi8Joc7BxAuTc
+Kkv6xYrdrwuWSWdFuKLKDJdIetgV9sHCTrDK8eVPSs0LmAECQQDOldq0mhrChCaY
+jF/5k+taQNahY33plI1Bc38DTZKUIrbziPklnHmKy84+laDAbyUVXap7dNnXPOo8
+fym7Pz3FAkEAzLTgDw4k4HfN2O40JTHysgFjKoVZBOtuJjOUMF9y0wy6KOF49WjH
+reFs/6KuwC1WWy7ew2K3hv7utv/G2WZyAQJBAKsWqF5SEj9uOpi0CPglbRD+CcL3
+Jtw/zwyZnmMZ538PkPz4P37KrE4qo9BpEwzL/6ZGQF6mU5NSO5uGpQUSRxECQD7v
+mTdnvNS6YLJCQgvxeFFb9dYb20uU6m+aSgQ5RD842X86GwswZLvD49QQezOgfL1a
+AqkFj7FUbaYbq1IpmgECQQCG/3lo8gI0mEKw9cdevp/BA/n4J9GNPMQwzeQFjU3g
+3Z0Ha+dU6IPhOoEZdgo5ovrspE8P9ez9nfd1wVL+e47S
+-----END RSA PRIVATE KEY-----

diff --git a/ssl/apache2/server.pem b/ssl/apache2/server.pem
new file mode 100644 (file)
index 0000000..999f9af
--- /dev/null
+++ b/ssl/apache2/server.pem
@@ -0,0 +1,34 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQClMWB091l5avRonKEbCSFTQzKpqQy2z4yLl0nV68R3wP0RbIR2
+kqGmKFP73y7j3Fw3/KWP2WzoeOMTqxPOLMAj1pwIRJU3RxMrHlIRwoYk8oCGXctt
+rYJXs5XS9T37Evq+Uo/u/ABsM0QuEn3NFOL777a8wfGh0RTGtUx4fj73xQIDAQAB
+AoGAFisxMaE8LbIvyJY0fKdWBJGBDAm2vhXOW7Fa5E12mUeZ7qusfykgbmb9FlEW
+PtgEvDK4mTxphC0s9CfCSanxwuZI++iwZG9t+hVp+d9u31ToyWfOi8Joc7BxAuTc
+Kkv6xYrdrwuWSWdFuKLKDJdIetgV9sHCTrDK8eVPSs0LmAECQQDOldq0mhrChCaY
+jF/5k+taQNahY33plI1Bc38DTZKUIrbziPklnHmKy84+laDAbyUVXap7dNnXPOo8
+fym7Pz3FAkEAzLTgDw4k4HfN2O40JTHysgFjKoVZBOtuJjOUMF9y0wy6KOF49WjH
+reFs/6KuwC1WWy7ew2K3hv7utv/G2WZyAQJBAKsWqF5SEj9uOpi0CPglbRD+CcL3
+Jtw/zwyZnmMZ538PkPz4P37KrE4qo9BpEwzL/6ZGQF6mU5NSO5uGpQUSRxECQD7v
+mTdnvNS6YLJCQgvxeFFb9dYb20uU6m+aSgQ5RD842X86GwswZLvD49QQezOgfL1a
+AqkFj7FUbaYbq1IpmgECQQCG/3lo8gI0mEKw9cdevp/BA/n4J9GNPMQwzeQFjU3g
+3Z0Ha+dU6IPhOoEZdgo5ovrspE8P9ez9nfd1wVL+e47S
+-----END RSA PRIVATE KEY-----
+
+-----BEGIN CERTIFICATE-----
+MIIC1TCCAj6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBsTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbnRhIEJhcmJhcmExGzAZ
+BgNVBAoTEkFwYWNoZSBIVFRQIFNlcnZlcjEiMCAGA1UECxMZRm9yIFRlc3Rpbmcg
+UHVycG9zZXMgT25seTEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR0wGwYJKoZIhvcN
+AQkBFg5yb290QGxvY2FsaG9zdDAeFw0xMjAyMjEwNjIwNTVaFw0xNDAyMjAwNjIw
+NTVaMIGuMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNU2FudGEgQmFyYmFyYTEbMBkGA1UEChMSQXBhY2hlIEhUVFAgU2VydmVyMSIw
+IAYDVQQLExlGb3IgVGVzdGluZyBQdXJwb3NlcyBPbmx5MRIwEAYDVQQDEwlsb2Nh
+bGhvc3QxHTAbBgkqhkiG9w0BCQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQClMWB091l5avRonKEbCSFTQzKpqQy2z4yLl0nV68R3
+wP0RbIR2kqGmKFP73y7j3Fw3/KWP2WzoeOMTqxPOLMAj1pwIRJU3RxMrHlIRwoYk
+8oCGXcttrYJXs5XS9T37Evq+Uo/u/ABsM0QuEn3NFOL777a8wfGh0RTGtUx4fj73
+xQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAAvR5LaxfHzSf4AL537J/e32TktA5uJc
+hpfBIPB0HmUh3tjdggFj+CfMSKW+HrW9xs1cpW8jhSxuixpzdD6AZrD4sn4IJC8B
+hSfbQ9r5u6U3jh0zgK/mqsgH3nqJbX1ztzL3gj7Q6lvWQpIiCAy2Cup5y2/0ecNz
+cvt+PnhuWQtJ
+-----END CERTIFICATE-----