committing changes in /etc after apt run

Package changes:
-ghostscript 9.26~dfsg+0-0ubuntu0.18.04.14 amd64
-ghostscript-x 9.26~dfsg+0-0ubuntu0.18.04.14 amd64
+ghostscript 9.26~dfsg+0-0ubuntu0.18.04.15 amd64
+ghostscript-x 9.26~dfsg+0-0ubuntu0.18.04.15 amd64
-libgs9 9.26~dfsg+0-0ubuntu0.18.04.14 amd64
-libgs9-common 9.26~dfsg+0-0ubuntu0.18.04.14 all
+libgs9 9.26~dfsg+0-0ubuntu0.18.04.15 amd64
+libgs9-common 9.26~dfsg+0-0ubuntu0.18.04.15 all
-python-lxml 4.2.1-1ubuntu0.4 amd64
+python-lxml 4.2.1-1ubuntu0.6 amd64
-python-pil 5.1.0-1ubuntu0.6 amd64
+python-pil 5.1.0-1ubuntu0.7 amd64
-python3-lxml 4.2.1-1ubuntu0.4 amd64
+python3-lxml 4.2.1-1ubuntu0.6 amd64
-python3-pil 5.1.0-1ubuntu0.6 amd64
+python3-pil 5.1.0-1ubuntu0.7 amd64
-ubuntu-advantage-tools 27.4.2~18.04.1 amd64
+ubuntu-advantage-tools 27.5~18.04.1 amd64

diff --git a/.etckeeper b/.etckeeper
index d5435b0ed1ef6c745786861cbdaa2d916323d4b2..6b4f4d6682d1571e1ac8967d4332ec410d5d7876 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -7333,6 +7333,7 @@ maybe chmod 0644 'letsencrypt/csr/3190_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3191_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3192_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3193_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3194_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -10529,6 +10530,7 @@ maybe chmod 0600 'letsencrypt/keys/3191_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3192_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3193_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3194_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3195_key-certbot.pem'
 maybe chmod 0755 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README'

diff --git a/letsencrypt/csr/3194_csr-certbot.pem b/letsencrypt/csr/3194_csr-certbot.pem
new file mode 100644 (file)
index 0000000..a3583b8
--- /dev/null
+++ b/letsencrypt/csr/3194_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANuw
+fm7tqCeKkEFbvtkjeGo0ynBmT5mFuyzY3CvvQ8qYLzlo37HD++4C7HjPEOixz+ke
+uGolw29q9Ql5QjtdM853SWyOVT0ALxuvKs9NMXqIrBR1xn3rmsJxaL4d/XVc+Uum
+d6WSg8ug5Lt3sSrT9CERgDKHavAPv0sYp2NeGlECxclMHRdRJfhr0rMNbhIzmvUq
+h4yYH876BQ2iQSoDQ3j58W4lF9VPk9UJi/hwUbD7Bpl1Osp+OCG272yOCXx3BHzS
+pNkBGO7jt/i2zHDvrsjQk2gXcjumR8XQyezIhzjX+p9ePp62jaKIdXNNQXxbz1q1
+NRxlKdPA1lkQeOQE/PkCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQArJjsf1tI4
+3tCNKOs6oxWu3Iqt5+C2gnxgSS5BVagG431QB/xPg6MCTsevtz9N1xhwJsRv0y+w
+hposlRKjpCXVRawlDvLsXe6wSOfaNyp1sfsvTsmoapCP8r2ad5z4UPZbHzZAvHJ+
+OzITkYwAHojVJNomTVCZHGgfRmXyWmWWWKPq3DfHc9bm184/gq8GAaYYS0BB6RLn
+8fy60wguvpDpMAfidzyfueGzBOfvev/62QeJ/ADF3doHRY+kUO4w+IUgfIdAgs8L
+poHSBchhvJ+z3S68PDqLJN1KBc4dqd1zqhACoJopMQMYD1dLknhKlUAgqReXrR7x
+FtTPLn206kjH
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/3195_key-certbot.pem b/letsencrypt/keys/3195_key-certbot.pem
new file mode 100644 (file)
index 0000000..5e48f3f
--- /dev/null
+++ b/letsencrypt/keys/3195_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDbsH5u7agnipBB
+W77ZI3hqNMpwZk+Zhbss2Nwr70PKmC85aN+xw/vuAux4zxDosc/pHrhqJcNvavUJ
+eUI7XTPOd0lsjlU9AC8bryrPTTF6iKwUdcZ965rCcWi+Hf11XPlLpnelkoPLoOS7
+d7Eq0/QhEYAyh2rwD79LGKdjXhpRAsXJTB0XUSX4a9KzDW4SM5r1KoeMmB/O+gUN
+okEqA0N4+fFuJRfVT5PVCYv4cFGw+waZdTrKfjghtu9sjgl8dwR80qTZARju47f4
+tsxw767I0JNoF3I7pkfF0MnsyIc41/qfXj6eto2iiHVzTUF8W89atTUcZSnTwNZZ
+EHjkBPz5AgMBAAECggEAXzpKE9uAoGM31JzoRUdS0va/Kamvp2SIlhAKoCC+yfrd
+vYzwKiZB9hHeXx+ivLsW3H4sghaMeKdsQAcH5qOn6T9b3Gp2GFMUGHP9oo5bfDny
+HYxP1hViqBZwyLhHPbBnf5tREbxI1OORQpHHgkEN+aeUYlLAz/6DdRHivPf1gFdd
+t5qtlpl+0qEgVvqhsKplKAq5B1aj9nqhs4IQhY41c9OahRUOoKmJYSHkhyFbVZA5
+uabnSV9+AiyMOD55N9SihEwEPPNfidPL2c4Vg6YpIjXNd1QcFQeuPz+qo2AcE5kP
+gcxxTcwzUdGtIRcVzy3xusvHgOz6F6YIZAnwoBLDgQKBgQDwQ78/vnZMS4OFVz8D
+wPwInx+NOLyEBYOmikOZjuVxsQhTdzZboZKngdz2OuVXNaLEnTVS49vTDfHmVp4w
+RX7+DkQlV8bB103Dg9TqKAcQ9UtDSy30QDZ7m6VoiUUA5DEmrgkCBPAJiCTcqx1K
+wG0dGGAnNjmD3iz5/geJ27zTxQKBgQDqE8jxYJO35iYz6LhZWIifgc3VeER5IvER
+m3yb27kB2SoUjON0kBY6KR1k/yp/JDmf+hTJQljLSgg9dCMqQwcSPyIQ+n2iT0h5
+/kXh1i00kWvweONC7aIWpVJv/v4DvOxMBdf7/FkkT2dtW4GVEIj3Pq2QIKtL8kKc
+wGAyD2NzpQKBgE9Ia8GjHfJLMNk9UwPwGLrXl1fIkxyVnT3Ffk0bxEbh/jdcrUlL
+ZdN0nO97u9YtUsrCfagenJlmjp5NkuGm7SL0njQcZO/uFjEgPZAPKVXFO9K26jEh
+R1k+oTR/p4+FvVpgL4TFEFh03oUayg2ytc7WDlSiJhSHqhvMYbxyEDtpAoGBAMnc
+WAy4sYsEwetABUKfk+qiYSR3e+1PUb9SbGpoWKqcYaqpOTn7S//KFxxS5I4SalNo
+seZB/hsJ9AMzFWRLu1xj73fe3NtNLf5uZkt0jTVpN0GArtO35HFNDsOgjeQhV1HU
+NEeNfj5O762iHSS0xrkZZ0oEslRjTkipqgths+01AoGBAOGxchbvBv9j2B8nlcBU
+w3QvXb5dx28pGYqMgIoZ9cGM30D7Xb0Sh4UfskaSBxB8E0IlQAbRmi8Mi5OnPBJ8
+MKa59cwo+yGjZvRRmVcRPHlHfOi/16sKGavwgJmSKWRkfZ8YAJrkqOwLPyfyOn43
+MMqaXqBP9/YYv1X1w4qtkZmD
+-----END PRIVATE KEY-----

diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml
index 3c93645a757a07a7ed67d394d66284d5e6bb1fc5..d5d6486c7c685a2cabddbe2e30ac2d4640c2715d 100644 (file)
--- a/ubuntu-advantage/help_data.yaml
+++ b/ubuntu-advantage/help_data.yaml
@@ -7,17 +7,11 @@ cc-eal:
 
 cis:
     help: |
-      CIS benchmarks locks down your systems by removing non-secure programs,
-      disabling unused filesystems, disabling unnecessary ports or services to
-      prevent cyber attacks and malware, auditing privileged operations and
-      restricting administrative privileges. The cis command installs
-      tooling needed to automate audit and hardening according to a desired
-      CIS profile - level 1 or level 2 for server or workstation on
-      Ubuntu 18.04 LTS or 16.04 LTS. The audit tooling uses OpenSCAP libraries
-      to do a scan of the system. The tool provides options to generate a
-      report in XML or a html format. The report shows compliance for all the
-      rules against the profile selected during the scan. You can find out
-      more at https://ubuntu.com/security/certifications#cis
+      Ubuntu Security Guide is a tool for hardening and auditing and allows for
+      environment-specific customizations. It enables compliance with profiles
+      such as DISA-STIG and the CIS benchmarks. Find out more at
+      https://ubuntu.com/security/certifications/docs/usg
+
 
 esm-apps:
     help: |