Merge pull request #2825 from EnterpriseDB/release/2022-06-20

Release: 2022-06-20
EnterpriseDB · Jun 20, 2022 · 140f956 · 140f956
2 parents f2d23d8 + e577164
commit 140f956
Show file tree

Hide file tree

Showing 182 changed files with 2,449 additions and 1,643 deletions.
diff --git a/advocacy_docs/supported-open-source/pgbackrest/02-installation.mdx b/advocacy_docs/supported-open-source/pgbackrest/02-installation.mdx
@@ -34,9 +34,9 @@ Once you configured the repositories, run the following command to install pgBac
 $ sudo yum install pgbackrest
 ```
 
-The following additional packages will be installed:
+The following additional packages may be installed to satisfy the dependencies:
 
-* `postgresql-libs`
+* `libpq5`
 * `libzstd`
 
 ### EDB Postgres Advanced Server

diff --git a/install_template/config.yaml b/install_template/config.yaml
@@ -189,7 +189,7 @@ products:
       - name: SLES 15
         arch: ppc64le
         supported versions: [1.16]
-  - name: EDB PgpoolII
+  - name: EDB Pgpool-II
     platforms:
       - name: CentOS 7
         arch: x86_64
@@ -227,7 +227,7 @@ products:
       - name: SLES 15
         arch: ppc64le
         supported versions: [4.3]
-  - name: EDB PgpoolII Extensions
+  - name: EDB Pgpool-II Extensions
     platforms:
       - name: CentOS 7
         arch: x86_64
@@ -337,16 +337,16 @@ products:
         supported versions: [9.6, 11, 12, 13, 14]
       - name: SLES 12
         arch: x86_64
-        supported versions: [14]
+        supported versions: [40]
       - name: SLES 12
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [40]
       - name: SLES 15
         arch: x86_64
-        supported versions: [14]
+        supported versions: [40]
       - name: SLES 15
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [40]
   - name: Failover Manager
     platforms:
       - name: CentOS 7
@@ -427,116 +427,116 @@ products:
     platforms:
       - name: CentOS 7
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: CentOS 7
         arch: ppc64le
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: AlmaLinux 8 or Rocky Linux 8
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: RHEL 7 or OL 7
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: RHEL 7 or OL 7
         arch: ppc64le
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: RHEL 8 or OL 8
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: Ubuntu 18.04 or Debian 9
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: Ubuntu 20.04 or Debian 10
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [5]
       - name: SLES 12
         arch: x86_64
-        supported versions: [14]
+        supported versions: [5]
       - name: SLES 12
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [5]
       - name: SLES 15
         arch: x86_64
-        supported versions: [14]
+        supported versions: [5]
       - name: SLES 15
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [5]
   - name: MySQL Foreign Data Wrapper
     platforms:
       - name: CentOS 7
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: CentOS 7
         arch: ppc64le
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: AlmaLinux 8 or Rocky Linux 8
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: RHEL 7 or OL 7
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: RHEL 7 or OL 7
         arch: ppc64le
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: RHEL 8 or OL 8
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: Ubuntu 18.04 or Debian 9
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: Ubuntu 20.04 or Debian 10
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [2]
       - name: SLES 12
         arch: x86_64
-        supported versions: [14]
+        supported versions: [2]
       - name: SLES 12
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [2]
       - name: SLES 15
         arch: x86_64
-        supported versions: [14]
+        supported versions: [2]
       - name: SLES 15
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [2]
   - name: PostGIS
     platforms:
       - name: CentOS 7
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: CentOS 7
         arch: ppc64le
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: AlmaLinux 8 or Rocky Linux 8
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: RHEL 7 or OL 7
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: RHEL 7 or OL 7
         arch: ppc64le
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: RHEL 8 or OL 8
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: Ubuntu 18.04 or Debian 9
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: Ubuntu 20.04 or Debian 10
         arch: x86_64
-        supported versions: [11, 12, 13, 14]
+        supported versions: [3.1]
       - name: SLES 12
         arch: x86_64
-        supported versions: [14]
+        supported versions: [3.1]
       - name: SLES 12
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [3.1]
       - name: SLES 15
         arch: x86_64
-        supported versions: [14]
+        supported versions: [3.1]
       - name: SLES 15
         arch: ppc64le
-        supported versions: [14]
+        supported versions: [3.1]
   - name: Postgres Enterprise Manager
     platforms:
       - name: CentOS 7

diff --git a/install_template/deploy.mjs b/install_template/deploy.mjs
@@ -124,8 +124,8 @@ const moveDoc = async (product, platform, version) => {
     "hadoop-foreign-data-wrapper": "05",
     "mongodb-foreign-data-wrapper": "04",
     "mysql-foreign-data-wrapper": "04",
-    "edb-pgpoolii": "01",
-    "edb-pgpoolii-extensions": "pgpoolext",
+    "edb-pgpool-ii": "01",
+    "edb-pgpool-ii-extensions": "pgpoolext",
     postgis: "01a",
     "edb-jdbc-connector": "04",
     "edb-ocl-connector": "04",
@@ -138,6 +138,10 @@ const moveDoc = async (product, platform, version) => {
 
   // prettier-ignore
   const destFilename = match(context, 
+    when({product: {name: "EDB*Plus", version: 40}, platform: {name: "SLES 12"}}, 
+    (ctx) => `edb_plus/40/03_installing_edb_plus/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_edbplus_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "EDB*Plus", version: 40}, platform: {name: "SLES 15"}}, 
+    (ctx) => `edb_plus/40/03_installing_edb_plus/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_dbplus_sles15_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Failover Manager", version: 4.4}, platform: {name: "SLES 12"}}, 
       (ctx) => `efm/4/03_installing_efm/${fmtArchPath(ctx)}/${prefix[plat]}_efm4_sles12_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Failover Manager", version: 4.4}, platform: {name: "SLES 15"}}, 
@@ -154,14 +158,14 @@ const moveDoc = async (product, platform, version) => {
       (ctx) => `migration_toolkit/55/05_installing_mtk/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_mtk55_sles12_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Migration Toolkit"}, platform: {name: "SLES 15"}}, 
       (ctx) => `migration_toolkit/55/05_installing_mtk/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_mtk55_sles15_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "MongoDB Foreign Data Wrapper", version: 14}, platform: {name: "SLES 12"}}, 
-      (ctx) => `mongo_data_adapter/14/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mongo_sles12_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "MongoDB Foreign Data Wrapper", version: 14}, platform: {name: "SLES 15"}}, 
-      (ctx) => `mongo_data_adapter/14/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mongo_sles15_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "MySQL Foreign Data Wrapper", version: 14}, platform: {name: "SLES 12"}}, 
-      (ctx) => `mysql_data_adapter/14/04_installing_the_mysql_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mysql_sles12_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "MySQL Foreign Data Wrapper", version: 14}, platform: {name: "SLES 15"}}, 
-      (ctx) => `mysql_data_adapter/14/04_installing_the_mysql_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mysql_sles15_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "SLES 12"}}, 
+      (ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mongo_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "SLES 15"}}, 
+      (ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mongo_sles15_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "MySQL Foreign Data Wrapper", version: 2}, platform: {name: "SLES 12"}}, 
+      (ctx) => `mysql_data_adapter/2/04_installing_the_mysql_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mysql_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "MySQL Foreign Data Wrapper", version: 2}, platform: {name: "SLES 15"}}, 
+      (ctx) => `mysql_data_adapter/2/04_installing_the_mysql_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_mysql_sles15_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "EDB OCL Connector"}, platform: {name: "SLES 12"}}, 
       (ctx) => `ocl_connector/${ctx.product.version}/04_open_client_library/01_installing_and_configuring_the_ocl_connector/install_on_linux_using_edb_repo/${fmtArchPath(ctx)}/${prefix[plat]}_ocl_connector14_sles12_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "EDB OCL Connector"}, platform: {name: "SLES 15"}}, 
@@ -170,18 +174,22 @@ const moveDoc = async (product, platform, version) => {
       (ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_sles12_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "EDB ODBC Connector"}, platform: {name: "SLES 15"}}, 
       (ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_sles15_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "EDB PgpoolII", version: 4.3}, platform: {name: "SLES 12"}}, 
+    when({product: {name: "EDB pgBouncer", version: 1.16}, platform: {name: "SLES 12"}}, 
+      (ctx) => `pgbouncer/1.16/01_installation/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_pgbouncer_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "EDB pgBouncer", version: 1.16}, platform: {name: "SLES 15"}}, 
+      (ctx) => `pgbouncer/1.16/01_installation/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_pgbouncer_sles15_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "EDB Pgpool-II", version: 4.3}, platform: {name: "SLES 12"}}, 
       (ctx) => `pgpool/4.3/01_installing_and_configuring_the_pgpool-II/${fmtArchPath(ctx)}/${prefix[plat]}_pgpool_sles12_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "EDB PgpoolII", version: 4.3}, platform: {name: "SLES 15"}}, 
-      (ctx) => `pgpool/4.3/01_installing_and_configuring_the_pgpool-II/${fmtArchPath(ctx)}/${prefix[plat]}_pgpool_sles15_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "EDB PgpoolII Extensions", version: 4.3}, platform: {name: "SLES 12"}}, 
+    when({product: {name: "EDB Pgpool-II", version: 4.3}, platform: {name: "SLES 15"}}, 
+      (ctx) => `pgpool/4.3/01_installing_and_configuring_the_pgpool-II/${fmtArchPath(ctx)}/${prefix[plat]}_pgpool_sles15_${fmtArchFilename(ctx)}.mdx`),      
+    when({product: {name: "EDB Pgpool-II Extensions", version: 4.3}, platform: {name: "SLES 12"}}, 
       (ctx) => `pgpool/4.3/02_extensions/${fmtArchPath(ctx)}/${prefix[plat]}_pgpoolext_sles12_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "EDB PgpoolII Extensions", version: 4.3}, platform: {name: "SLES 15"}}, 
+    when({product: {name: "EDB Pgpool-II Extensions", version: 4.3}, platform: {name: "SLES 15"}}, 
       (ctx) => `pgpool/4.3/02_extensions/${fmtArchPath(ctx)}/${prefix[plat]}_pgpoolext_sles15_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "PostGIS", version: 14}, platform: {name: "SLES 12"}}, 
-      (ctx) => `postgis/14/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_postgis_sles12_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "PostGIS", version: 14}, platform: {name: "SLES 15"}}, 
-      (ctx) => `postgis/14/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_postgis_sles15_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.1}, platform: {name: "SLES 12"}}, 
+      (ctx) => `postgis/3.1/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_postgis_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.1}, platform: {name: "SLES 15"}}, 
+      (ctx) => `postgis/3.1/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_postgis_sles15_${fmtArchFilename(ctx)}.mdx`),
   );
 
   function match(context, ...conditions) {

diff --git a/install_template/templates/platformBase/_epasVersionInPackageName.njk b/install_template/templates/platformBase/_epasVersionInPackageName.njk
@@ -0,0 +1 @@
+Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
diff --git a/install_template/templates/platformBase/_shared.njk b/install_template/templates/platformBase/_shared.njk
@@ -15,4 +15,6 @@ sed -i "s@<username>:<password>@USERNAME:PASSWORD@" /etc/yum.repos.d/edb.repo
 ```
 {% endmacro %}
 
-{% macro centosInstallCommand(packageManager, packageName) %}{{packageManager}} -y install {{ packageName }}{% endmacro %}
+{% macro centosInstallCommand(packageManager, packageName) %}{{packageManager}} -y install {{ packageName }}{% endmacro %}
+
+
diff --git a/install_template/templates/platformBase/base.njk b/install_template/templates/platformBase/base.njk
@@ -1,5 +1,5 @@
 ---
-navTitle: {{ platform.name }} on {{ platform.arch }}
+navTitle: {{ platform.name }}
 title: Installing {{ product.name }} on {{ platform.name }} {{ platform.arch }}
 ---
 

diff --git a/install_template/templates/platformBase/centos-7.njk b/install_template/templates/platformBase/centos-7.njk
@@ -28,7 +28,6 @@ EOF
 ```shell
 {{ centosInstallCommand("yum", packageName) }}
 ```
-
 !!! Note
     Once the edb repository is set up, you can install any of the EDB products by using the relevant package name at this step. You can use `yum list available` command to check the available packages.
 

diff --git a/install_template/templates/platformBase/rhel-8-or-ol-8.njk b/install_template/templates/platformBase/rhel-8-or-ol-8.njk
@@ -16,7 +16,6 @@ dnf -qy module disable postgresql
 ```shell
 {{ centosInstallCommand("dnf", packageName) }}
 ```
-
 !!! Note
     Once the edb repository is set up, you can install any of the EDB products by using the relevant package name at this step. You can use `dnf list available` command to check the available packages.
 {% endblock installCommand %}
diff --git a/...tensions/almalinux-8-or-rocky-linux-8.njk → ...tensions/almalinux-8-or-rocky-linux-8.njk b/...tensions/almalinux-8-or-rocky-linux-8.njk → ...tensions/almalinux-8-or-rocky-linux-8.njk
@@ -1,4 +1,4 @@
-{% extends "products/edb-pgpoolii/base.njk" %}
+{% extends "products/edb-pgpool-ii/base.njk" %}
 {% set platformBaseTemplate = "almalinux-8-or-rocky-linux-8" %}
 {% block prerequisites %}
 {{ super() }}

diff --git a/...products/edb-pgpoolii-extensions/base.njk → ...roducts/edb-pgpool-ii-extensions/base.njk b/...products/edb-pgpoolii-extensions/base.njk → ...roducts/edb-pgpool-ii-extensions/base.njk
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/centos-7.njk b/install_template/templates/products/edb-pgpool-ii-extensions/centos-7.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "centos-7" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/centos-7_ppc64le.njk b/install_template/templates/products/edb-pgpool-ii-extensions/centos-7_ppc64le.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/centos-7.njk" %}
+{% set includePPC = true %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/debian-10.njk b/install_template/templates/products/edb-pgpool-ii-extensions/debian-10.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "debian-10" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/debian-9.njk b/install_template/templates/products/edb-pgpool-ii-extensions/debian-9.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "debian-9" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/rhel-7-or-ol-7.njk b/install_template/templates/products/edb-pgpool-ii-extensions/rhel-7-or-ol-7.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "rhel-7-or-ol-7" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/rhel-7-or-ol-7_ppc64le.njk b/install_template/templates/products/edb-pgpool-ii-extensions/rhel-7-or-ol-7_ppc64le.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/rhel-7-or-ol-7.njk" %}
+{% set includePPC = true %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/rhel-8-or-ol-8.njk b/install_template/templates/products/edb-pgpool-ii-extensions/rhel-8-or-ol-8.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "rhel-8-or-ol-8" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/sles-12.njk b/install_template/templates/products/edb-pgpool-ii-extensions/sles-12.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "sles-12" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/sles-12_ppc64le.njk b/install_template/templates/products/edb-pgpool-ii-extensions/sles-12_ppc64le.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "sles-12" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/sles-15.njk b/install_template/templates/products/edb-pgpool-ii-extensions/sles-15.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
+{% set platformBaseTemplate = "sles-15" %}
diff --git a/...b-pgpoolii-extensions/sles-15_ppc64le.njk → ...-pgpool-ii-extensions/sles-15_ppc64le.njk b/...b-pgpoolii-extensions/sles-15_ppc64le.njk → ...-pgpool-ii-extensions/sles-15_ppc64le.njk
@@ -1,3 +1,3 @@
-{% extends "products/edb-pgpoolii-extensions/base.njk" %}
+{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
 {% set platformBaseTemplate = "sles-15" %}
 {% set includePPC = true %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/ubuntu-18.04.njk b/install_template/templates/products/edb-pgpool-ii-extensions/ubuntu-18.04.njk
@@ -0,0 +1 @@
+{% extends "products/edb-pgpool-ii-extensions/debian-10.njk" %}
diff --git a/install_template/templates/products/edb-pgpool-ii-extensions/ubuntu-20.04.njk b/install_template/templates/products/edb-pgpool-ii-extensions/ubuntu-20.04.njk
@@ -0,0 +1 @@
+{% extends "products/edb-pgpool-ii-extensions/debian-10.njk" %}
diff --git a/...pgpoolii/almalinux-8-or-rocky-linux-8.njk → ...gpool-ii/almalinux-8-or-rocky-linux-8.njk b/...pgpoolii/almalinux-8-or-rocky-linux-8.njk → ...gpool-ii/almalinux-8-or-rocky-linux-8.njk
@@ -1,4 +1,4 @@
-{% extends "products/edb-pgpoolii/base.njk" %}
+{% extends "products/edb-pgpool-ii/base.njk" %}
 {% set platformBaseTemplate = "almalinux-8-or-rocky-linux-8" %}
 {% block prerequisites %}
 {{ super() }}

diff --git a/.../templates/products/edb-pgpoolii/base.njk → ...templates/products/edb-pgpool-ii/base.njk b/.../templates/products/edb-pgpoolii/base.njk → ...templates/products/edb-pgpool-ii/base.njk
@@ -4,5 +4,5 @@
 ```shell
 zypper -n install {{ packageName }}
 ```
-Where `<xx>` is the version of EDB PbPool-II you are installing.
+Where `<xx>` is the version of EDB PgPool-II you are installing.
 {% endblock installCommand %}
diff --git a/install_template/templates/products/edb-pgpool-ii/centos-7.njk b/install_template/templates/products/edb-pgpool-ii/centos-7.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii/base.njk" %}
+{% set platformBaseTemplate = "centos-7" %}
diff --git a/install_template/templates/products/edb-pgpool-ii/centos-7_ppc64le.njk b/install_template/templates/products/edb-pgpool-ii/centos-7_ppc64le.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii/centos-7.njk" %}
+{% set includePPC = true %}
diff --git a/install_template/templates/products/edb-pgpool-ii/debian-10.njk b/install_template/templates/products/edb-pgpool-ii/debian-10.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii/base.njk" %}
+{% set platformBaseTemplate = "debian-10" %}
diff --git a/install_template/templates/products/edb-pgpool-ii/debian-9.njk b/install_template/templates/products/edb-pgpool-ii/debian-9.njk
@@ -0,0 +1,2 @@
+{% extends "products/edb-pgpool-ii/base.njk" %}
+{% set platformBaseTemplate = "debian-9" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
		{% set platformBaseTemplate = "centos-7" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/centos-7.njk" %}
		{% set includePPC = true %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
		{% set platformBaseTemplate = "debian-10" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
		{% set platformBaseTemplate = "debian-9" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
		{% set platformBaseTemplate = "rhel-7-or-ol-7" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
		{% set platformBaseTemplate = "rhel-8-or-ol-8" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
		{% set platformBaseTemplate = "sles-12" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii-extensions/base.njk" %}
		{% set platformBaseTemplate = "sles-15" %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% extends "products/edb-pgpool-ii/base.njk" %}
		{% set platformBaseTemplate = "centos-7" %}