Merge branch 'master' into 3new-fips

docs/eportal-api/README.md

@@ -597,7 +597,7 @@ Puppet provides the framework to run tasks on target systems. The following is a
 
 Unregister KernelCare agent through API call:
 
-```bash
+```
 #!/bin/bash
 
 EPORTAL_API_USERNAME=<your ePortal api user name>
@@ -616,7 +616,7 @@ curl -kL -u "${EPORTAL_API_PASSWORD}"':'"${EPORTAL_API_PASSWORD}" -X POST "${EPO
 
 Example (unregister_server.sh):
 
-```bash
+```
 #!/bin/bash
 
 EPORTAL_API_USERNAME=admin

docs/extended-lifecycle-support-for-languages/README.md

@@ -138,13 +138,13 @@ rsync://repo.cloudlinux.com/PHP_ELS/
 
 Example of creating a local mirror for all supported OS versions:
 
-```bash
+```
 rsync -avSHP --delete rsync://repo.cloudlinux.com/PHP_ELS/ .
 ```
 
 Example of creating a local mirror for a specific OS version:
 
-```bash
+```
 rsync -avSHP --delete rsync://repo.cloudlinux.com/PHP_ELS/el6/ .
 ```
 
@@ -193,19 +193,19 @@ Currently, we provide OVAL data for the following OS versions:
 
 1. Install OpenSCAP
     * for rpm systems:
-    ```bash
+    ```
     yum install openscap openscap-utils scap-security-guide -y
     ```
     * for  deb systems:
-    ```bash
+    ```
     apt-get install libopenscap8 -y
     ```
 2. Download OVAL stream:
-```bash
+```
 wget https://repo.cloudlinux.com/php-els/centos6-els-php-oval.xml
 ```
 3. Run scanning:
-```bash
+```
 oscap oval eval --results result.xml --report report.xml centos6-els-php-oval.xml
 ```
 
@@ -221,7 +221,7 @@ When you deploy an updated version of PHP through PHP ELS, using your system’s
 
 **The *bin* files:**
 
-```javascript
+```
 [root@localhost ~]# ll /opt/alt/phpXY/usr/bin/
 bytekit          hphpa            pear             pecl             phar.phar        phpcb            php-config       phpcpd           phploc           phpunit-skelgen
 dbunit           lsphp            peardev          phar             php              php-cgi          phpcov           phpize           phpunit          ppw
@@ -230,7 +230,7 @@ dbunit           lsphp            peardev          phar             php
 
 ***Modules* and *pecl* extensions:**
 
-```javascript
+```
 ls /opt/alt/phpXY/usr/lib64/php/modules/
 ZendGuardLoader.so  imagick.so         oci8.so          stem.so
 amqp.so             imap.so            odbc.so          stomp.so
@@ -268,14 +268,14 @@ igbinary.so         oauth.so           stats.so
 
 **Running code on a specific version through the CLI:**
 
-```javascript
+```
 [root@localhost ~]# /opt/alt/phpXY/usr/bin/php helloworld.php
 Hello, World!
 ```
 
 **Location of *ini* config files:**
 
-```javascript
+```
 [root@localhost ~]# ls /opt/alt/phpXY/etc/php.d.all/
 40-leveldb.ini        mailparse.ini     redis.ini
 40-snuffleupagus.ini  mbstring.ini      rrd.ini
@@ -314,13 +314,13 @@ lzf.ini               raphf.ini
 
 **Location of *default.ini*:**
 
-```javascript
+```
 ls /opt/alt/phpXY/etc/php.d/default.ini
 ```
 
 **Listing enabled modules on a specific version:**
 
-```javascript
+```
 [root@localhost ~]# /opt/alt/php73/usr/bin/php -m
 [PHP Modules]
 bz2
@@ -357,7 +357,7 @@ zlib
 
 **Enabling a module through the CLI:**
 
-```javascript
+```
 [root@localhost ~]# /opt/alt/php73/usr/bin/php -d "extension=igbinary.so" -m
 [PHP Modules]
 bz2
@@ -403,17 +403,17 @@ Extended Lifecycle Support (ELS) for Python from TuxCare provides security fixes
 
 1. Download an installer script:
 
-```bash
+```
 wget https://repo.cloudlinux.com/python-els/install-python-els-repo.sh
 ```
 2. Run the installer script with keys. The installation script registers the server in the CLN with the key, adds a PGP key and adds repository to the server.
-```bash
+```
 sh install-python-els-repo.sh --license-key XXX-XXXXXXXXXXXX
 ```
 3. Verify that the installation was successful.
 
 To ensure the installation has been completed successfully, run the following command. It should return the info about an available package. If information about the package will be available, it would mean that installation was successful. After that, updates will be available for installation from the repository using the usual yum upgrade command.
-```bash
+```
 yum info python2
 
 Available Packages
@@ -431,7 +431,7 @@ Description  : Python 2 is an old version of the language that is incompatible
              : with the 3.x line of releases.
 ```
 4. To install python, it's necessary to enable the CodeReady Builder(CRB) repository, which contains the `gdbm` package.
-```bash
+```
 yum install python2 --enablerepo crb
 ```
 Once installed, you can use python2 in the usual way.
@@ -451,13 +451,13 @@ To obtain the access to the local mirroring, provide your External IP address to
 
 To create a local mirror of the repository with security updates via `rsync`, use the following:
 
-```bash
+```
 rsync://repo.cloudlinux.com/PYTHON_ELS/
 ```
 
 Example of creating a local mirror for all supported OS versions:
 
-```bash
+```
 rsync  -avSHP --delete rsync://repo.cloudlinux.com/PYTHON_ELS/ .
 ```
 
@@ -475,14 +475,14 @@ AlmaLinux 9: [https://repo.cloudlinux.com/python-els/almalinux9-els-python-oval.
 #### How to use OVAL
 
 1. Install OpenSCAP:
-```bash
+```
 yum install openscap openscap-utils scap-security-guide -y
 ```
 2. Download OVAL stream:
-```bash
+```
 wget https://repo.cloudlinux.com/python-els/almalinux9-els-python-oval.xml
 ```
 3. Run scanning:
-```bash
+```
 oscap oval eval --results result.xml --report report.xml almalinux9-els-python-oval.xml
 ```

docs/extended-lifecycle-support/README.md

@@ -8,7 +8,9 @@ Our ELS service is designed to provide solutions for organizations that are not
 
 TuxCare employs the Common Vulnerability Scoring System (CVSS v3) to assess the severity of security vulnerabilities. Our severity rating system for patching vulnerabilities integrates both NVD scoring and vendor scoring (when available). When the vendor's score is lower than the NVD score, we give priority to the NVD score.
 
-TuxCare Extended Lifecycle Support, by default, provides security patches for High and Critical vulnerabilities (with a 7+ CVSS score). For vulnerabilities rated as Medium (4.0 to 6.9), and/or when patches are required for FIPS-certified deployments, custom coverage options are available. Specific details regarding these coverage options and their pricing can be obtained by contacting our sales team.
+TuxCare Extended Lifecycle Support, by default, provides security patches for High and Critical vulnerabilities (with a 7+ CVSS score). For vulnerabilities rated as Medium (4.0 to 6.9), TuxCare can provide patches for CVE's where mitigations are not available and there is sufficient customer demand.
+
+Custom coverage options are available, including a 10-pack of customer-directed patches for clients who need CVEs patched outside of the ELS scope. Specific details regarding these coverage options and their pricing can be obtained by contacting our sales team.
 
 ### Target response times
 

docs/jp/eportal-api/README.md

@@ -256,7 +256,7 @@ Puppetは、対象のシステムでタスクを実行するためのフレー
 
 API呼び出しを介してKernelCareエージェントを登録解除します。
 
-```bash
+```
 #!/bin/bash
 
 EPORTAL_API_USERNAME=<your ePortal api user name>
@@ -275,7 +275,7 @@ curl -kL -u "${EPORTAL_API_PASSWORD}"':'"${EPORTAL_API_PASSWORD}" -X POST "${EPO
 
 例（unregister_server.sh）：
 
-```bash
+```
 #!/bin/bash
 
 EPORTAL_API_USERNAME=admin

docs/jp/eportal/README.md

@@ -464,22 +464,22 @@ ePortalサーバーをKernelCareパッチサーバーに接続して、パッチ
 
 ePortalのテストインスタンスと本番インスタンスの違いを見てみましょう。
 
-```bash
+```
 $ comm -23 \
     <(ssh eportal-test "ls /usr/share/kcare-eportal/arch/K*.tar.bz2" | sort -h) \
     <(ssh eportal-prod "ls /usr/share/kcare-eportal/arch/K*.tar.bz2" | sort -h) | tee patchsets.diff
 ```
 
 本番環境にパッチセットをアップロードします。
 
-```bash
+```
 $ cat patchsets.diff | xargs -Phav {} rsync -iv eportal-test:{} /tmp/
 $ rsync -Phav /tmp/K*.tar.bz2 eportal-prod:/tmp/
 ```
 
 パッチセットファイル名をパラメーターとして、展開ツールを実行します。
 
-```bash
+```
 $ ssh eportal-prod 'ls /tmp/K*.tar.bz2 | sort -h | xargs -n1 kc.eportal kcare deploy'
 2021-12-02 01:25:06,555 - eportal.patches - INFO - K04082020_1 was enabled in main
 ...