committing changes in /etc after apt run

author mhoellein <mhoellein@freenet.de>

Wed, 7 Dec 2022 08:16:39 +0000 (09:16 +0100)

committer mhoellein <mhoellein@freenet.de>

Wed, 7 Dec 2022 08:16:39 +0000 (09:16 +0100)
author mhoellein <mhoellein@freenet.de>
Wed, 7 Dec 2022 08:16:39 +0000 (09:16 +0100)
committer mhoellein <mhoellein@freenet.de>
Wed, 7 Dec 2022 08:16:39 +0000 (09:16 +0100)
diff --git a/.etckeeper b/.etckeeper

index a605428a2ab361f6b2ce186eb45f8ad59acbbe57..2e69e6c6d322c28bbb5075d0df9e826d693cb2a2 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -8171,6 +8171,7 @@ maybe chmod 0644 'letsencrypt/csr/3791_csr-certbot.pem'
  maybe chmod 0644 'letsencrypt/csr/3792_csr-certbot.pem'
  maybe chmod 0644 'letsencrypt/csr/3793_csr-certbot.pem'
  maybe chmod 0644 'letsencrypt/csr/3794_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3795_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'
@@ -11968,6 +11969,7 @@ maybe chmod 0600 'letsencrypt/keys/3792_key-certbot.pem'
  maybe chmod 0600 'letsencrypt/keys/3793_key-certbot.pem'
  maybe chmod 0600 'letsencrypt/keys/3794_key-certbot.pem'
  maybe chmod 0600 'letsencrypt/keys/3795_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3796_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/ca-certificates.conf b/ca-certificates.conf

index a517b2c3367aea98ee71e7d34c3b3d6afe57727d..ca44c2f913b76a8833bde1792fd4463a0877f5a2 100644 (file)
--- a/ca-certificates.conf
+++ b/ca-certificates.conf
@@ -223,9 +223,9 @@ mozilla/SSL.com_EV_Root_Certification_Authority_ECC.crt
  mozilla/SSL.com_EV_Root_Certification_Authority_RSA_R2.crt
  mozilla/SSL.com_Root_Certification_Authority_ECC.crt
  mozilla/SSL.com_Root_Certification_Authority_RSA.crt
-mozilla/TrustCor_ECA-1.crt
-mozilla/TrustCor_RootCert_CA-1.crt
-mozilla/TrustCor_RootCert_CA-2.crt
+!mozilla/TrustCor_ECA-1.crt
+!mozilla/TrustCor_RootCert_CA-1.crt
+!mozilla/TrustCor_RootCert_CA-2.crt
  mozilla/GlobalSign_Root_CA_-_R6.crt
  mozilla/OISTE_WISeKey_Global_Root_GC_CA.crt
  mozilla/Certigna_Root_CA.crt
diff --git a/coolwsd/coolkitconfig.xcu b/coolwsd/coolkitconfig.xcu

index 88e698a04775ed217caede1290c3aa0917c65aa6..08b92e11fa404de7132a1999ad2e1a72b4572b12 100644 (file)
--- a/coolwsd/coolkitconfig.xcu
+++ b/coolwsd/coolkitconfig.xcu
@@ -62,4 +62,7 @@
  <item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/GrammarCheckerList"><prop oor:name="zh-CN" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.LanguageToolGrammarChecker</it></value></prop></item>
  <item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/GrammarCheckerList"><prop oor:name="ro-RO" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.LanguageToolGrammarChecker</it></value></prop></item>
  
+<!-- Hide MediaPlaybackPanel on sidebar. It does not work in Online. Video playback controls are implemented by the browser.  -->
+<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/PanelList/org.openoffice.Office.UI.Sidebar:Panel['MediaPlaybackPanel']"><prop oor:name="ContextList" oor:op="fuse"><value><it>any</it><it>default</it><it>hidden</it></value></prop></item>
+
  </oor:items>
diff --git a/letsencrypt/csr/3795_csr-certbot.pem b/letsencrypt/csr/3795_csr-certbot.pem

new file mode 100644 (file)

index 0000000..02f56b5
--- /dev/null
+++ b/letsencrypt/csr/3795_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu+
+fexmkwH5NlgBDdOtS1HjN0YWWNzrzZtq81SG6+o+YwzQIpxKvEr5XzB5YRsnLbOt
+3YK5KmP+ImzzUfASAkkPnXMaSxIVSFrabKaLRgBCzH3m/CTHv1MXXOxITa+CiJ9a
+fKpjbsZcTLE56KQYVIKcYTjZnGWubgiykAT9N1sEFYfJjRDq8NZtTsDXyYc84eHA
+rmf/5D9FTm/oubHZvFqeqkgTxs8NBnGVjCqcffFQaqW1WfXX161fL/RCqLH4Spag
+U+k7CB+jwKYP1GY1keslxtNIT83aYWzXwhLhNEXWKyicXpQRQBBlvX+1cD7kYhzP
+lzYINIPiKZIeTTCrXfUCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQA3mzIMkkGf
+JGmX4knnsMOOFy+oEXcUqS8Y4KRIAjKP5Mnf7idDfMzbFbR3MkEanXu6DdYHT8tX
+tJ8Am+qoRIOJeMlnzfkgZATzwLOV8dzzWgiBv1hEpcb2a0hzdKJJDsbQ4zYaeEu2
+Sa4MeHAczZRGA6oeGQwFU7BmoAO8X7m4GeLYTITy+GfuDtpFhu/DaxxmlAyppST5
+CtRCri+M/evI8ffQkJDqzPgsVpxyuZ2dszG9nNkH360E99d3AOUW2LI4odtTFl7e
+9rCoIyCsByuM2INPfDJweYqM2UfaTn2Y/iaoHCUi6+V1+PRC0mQXjQlsBNtimcdg
+ElNzDRGQFda1
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/3796_key-certbot.pem b/letsencrypt/keys/3796_key-certbot.pem

new file mode 100644 (file)

index 0000000..b462fcc
--- /dev/null
+++ b/letsencrypt/keys/3796_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLvn3sZpMB+TZY
+AQ3TrUtR4zdGFljc682bavNUhuvqPmMM0CKcSrxK+V8weWEbJy2zrd2CuSpj/iJs
+81HwEgJJD51zGksSFUha2mymi0YAQsx95vwkx79TF1zsSE2vgoifWnyqY27GXEyx
+OeikGFSCnGE42Zxlrm4IspAE/TdbBBWHyY0Q6vDWbU7A18mHPOHhwK5n/+Q/RU5v
+6Lmx2bxanqpIE8bPDQZxlYwqnH3xUGqltVn119etXy/0Qqix+EqWoFPpOwgfo8Cm
+D9RmNZHrJcbTSE/N2mFs18IS4TRF1isonF6UEUAQZb1/tXA+5GIcz5c2CDSD4imS
+Hk0wq131AgMBAAECggEACoUzi1lgjeGIZNLpG9z+3qOU3xGYVQ/39eZ32g19cQL3
+qlm0780MG/L0b1RVJ0nGmliH75AQGEmvDWEjAfpsE8myn5bj+XMP4WEV6yOV4b2R
+QY8DxgJqZqf2LF0vZbifxVquxT2NIsDxVNVgpdh7xKK+gmj6ImX3WIuf1CIfEZv0
+uhJ1QiPYauI0n9m08zQHFEqixDvZ46cy1jvOZNNOd3s3HS/NFb3q4ltqqH+fKa1r
+fodTU8F64khlZAi8811fkQWdT+z7Cl1myBJBvEPudC9gE2J+MdBLjV7IlX0zzKlf
+plGNGiWnU7kGTEeWqKMgBnzitUVlyGCoD99gAED5AQKBgQD2BbioUUYjKUoH2wXl
+vR74IewRSRrMvG1LK1hJrFO5TuO+a64XLTRKXr7GBZRqLyoMswhvEnerimch8aQu
+DOxMqfOyosMpgYotw+V9waYsUIUjhQFnMFfrzlJjD1aUc7y2JmwXGD8QiLgIK5kq
++iaf+Z1G4JzdQ6zajL50CRvH6QKBgQDUAdM2tUWX6NqwpwFWaAAV56Tfxz7Nts8M
+ikPVCtd3CJOwhVSRjtu2myNBTzkfw55pJed7TFElMdnRwpv72OsW2/EkyjqFGOwY
+0vTxr6FY4s+FcS8vtAQr9hkx596mVj9CMeibU6tXXn+PZ6MCEvrVYcQTpoIbgRUz
+JEhBRvUqLQKBgQDgQNLTSlIeVtKOWo0DnuIN2A3wq6xsFw2gyT/O1+/xKAHcXxbv
+NVtGtxo6MnfYWml/7emwJStECAJ+JF89QrZaI0hp+obe3J9xm/EiMlQgbL0PZXuj
+7aMW5JighyiqZN0NQ/SfEJDbp2PovqT9UcvHYqaEJtWVssxq4oPwDSVvkQKBgH2V
+Oy0sAbZzi5+avdMWNf7DwcmA9/XZdRpjiLzY+DsdjIbC5A55BjNMAH0+VYM4WEzG
+1DEYSvTya6myUr3Dh7Z5wIVfeXy//5LQ26GSvMuvRugv3JiwVMxJsjD6vcvgSQaI
+E9Z2oIdXhc5HwKqI3aaqjABr4KQ0OX+a3WY1hyJdAoGAYlBvgvN0Ty8YmZ2GaJGb
+F6nUK8ZYU8eJZ1/LhqMEr9SqAJetManOEj/jZbMPP8L2q7uMRmK9KwIpSVPPWRnc
+5vHHAeiFPjEcbaTJsB+ha4kHL8sHk7uucpSnwtXxaqLwE8k1ks3BSzgBTfDVCpLr
+XfyMYYDf+cPPj7U77of0jpk=
+-----END PRIVATE KEY-----
diff --git a/ssl/certs/3e44d2f7.0 b/ssl/certs/3e44d2f7.0

deleted file mode 120000 (symlink)

index a2d890d..0000000
--- a/ssl/certs/3e44d2f7.0
+++ /dev/null
@@ -1 +0,0 @@
-TrustCor_RootCert_CA-2.pem
-\ No newline at end of file
diff --git a/ssl/certs/5d3033c5.0 b/ssl/certs/5d3033c5.0

deleted file mode 120000 (symlink)

index 53dceb0..0000000
--- a/ssl/certs/5d3033c5.0
+++ /dev/null
@@ -1 +0,0 @@
-TrustCor_RootCert_CA-1.pem
-\ No newline at end of file
diff --git a/ssl/certs/7aaf71c0.0 b/ssl/certs/7aaf71c0.0

deleted file mode 120000 (symlink)

index 86ed3f8..0000000
--- a/ssl/certs/7aaf71c0.0
+++ /dev/null
@@ -1 +0,0 @@
-TrustCor_ECA-1.pem
-\ No newline at end of file
diff --git a/ssl/certs/TrustCor_ECA-1.pem b/ssl/certs/TrustCor_ECA-1.pem

deleted file mode 120000 (symlink)

index eb7d639..0000000
--- a/ssl/certs/TrustCor_ECA-1.pem
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/ca-certificates/mozilla/TrustCor_ECA-1.crt
-\ No newline at end of file
diff --git a/ssl/certs/TrustCor_RootCert_CA-1.pem b/ssl/certs/TrustCor_RootCert_CA-1.pem

deleted file mode 120000 (symlink)

index 5334459..0000000
--- a/ssl/certs/TrustCor_RootCert_CA-1.pem
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/ca-certificates/mozilla/TrustCor_RootCert_CA-1.crt
-\ No newline at end of file
diff --git a/ssl/certs/TrustCor_RootCert_CA-2.pem b/ssl/certs/TrustCor_RootCert_CA-2.pem

deleted file mode 120000 (symlink)

index 68de1ae..0000000
--- a/ssl/certs/TrustCor_RootCert_CA-2.pem
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/ca-certificates/mozilla/TrustCor_RootCert_CA-2.crt
-\ No newline at end of file
diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml

index 1b66441f3c38e7f8e1477ede3e1c0c604fedf2ff..45887d840d380156bf9cd15f68136730e282426e 100644 (file)
--- a/ubuntu-advantage/help_data.yaml
+++ b/ubuntu-advantage/help_data.yaml
@@ -62,13 +62,11 @@ livepatch:
  
  realtime-kernel:
    help: |
-    The real-time kernel is a beta version of the 22.04 Ubuntu kernel with the
-    PREEMPT_RT patchset integrated for x86_64 and ARM64. It services extreme
-    latency-dependent use cases and provides deterministic response times to
-    service events. By meeting stringent preemption specifications, the
-    real-time kernel is suitable for telco applications and embedded devices
-    in industrial automation and robotics. To enroll in the beta program, visit
-    https://ubuntu.com/realtime-kernel
+    The real-time kernel is an Ubuntu kernel with PREEMPT_RT patches integrated.
+    It services latency-dependent use cases by providing deterministic response times.
+    The real-time kernel meets stringent preemption specifications and is suitable for
+    telco applications and dedicated devices in industrial automation and robotics.
+    The real-time kernel is currently incompatible with FIPS and Livepatch. 
  
  ros:
    help: |
diff --git a/update-motd.d/91-contract-ua-esm-status b/update-motd.d/91-contract-ua-esm-status

index ceb22723c336e5a0c309daa5c0b2c1003d9669db..cc823340c157f7b863b6b2da6d653483de19a620 100755 (executable)
--- a/update-motd.d/91-contract-ua-esm-status
+++ b/update-motd.d/91-contract-ua-esm-status
@@ -1,4 +1,8 @@
  #!/bin/sh
-stamp="/var/lib/ubuntu-advantage/messages/motd-esm-service-status"
+esm_stamp="/var/lib/ubuntu-advantage/messages/motd-esm-service-status"
  
-[ ! -r "$stamp" ] || cat "$stamp"
+[ ! -r "$esm_stamp" ] || cat "$esm_stamp"
+
+auto_attach_stamp="/var/lib/ubuntu-advantage/messages/motd-auto-attach-status"
+
+[ ! -r "$auto_attach_stamp" ] || cat "$auto_attach_stamp"
author	mhoellein <mhoellein@freenet.de>
	Wed, 7 Dec 2022 08:16:39 +0000 (09:16 +0100)
committer	mhoellein <mhoellein@freenet.de>
	Wed, 7 Dec 2022 08:16:39 +0000 (09:16 +0100)
.etckeeper		patch \| blob \| history
ca-certificates.conf		patch \| blob \| history
coolwsd/coolkitconfig.xcu		patch \| blob \| history
letsencrypt/csr/3795_csr-certbot.pem	[new file with mode: 0644]	patch \| blob
letsencrypt/keys/3796_key-certbot.pem	[new file with mode: 0644]	patch \| blob
ssl/certs/3e44d2f7.0	[deleted symlink]	patch \| blob \| history
ssl/certs/5d3033c5.0	[deleted symlink]	patch \| blob \| history
ssl/certs/7aaf71c0.0	[deleted symlink]	patch \| blob \| history
ssl/certs/TrustCor_ECA-1.pem	[deleted symlink]	patch \| blob \| history
ssl/certs/TrustCor_RootCert_CA-1.pem	[deleted symlink]	patch \| blob \| history
ssl/certs/TrustCor_RootCert_CA-2.pem	[deleted symlink]	patch \| blob \| history
ubuntu-advantage/help_data.yaml		patch \| blob \| history
update-motd.d/91-contract-ua-esm-status		patch \| blob \| history