Merge pull request #3301 from EnterpriseDB/release/2022-11-02

Release: 2022-11-02
EnterpriseDB · Nov 2, 2022 · c6cbd98 · c6cbd98
2 parents 7b79ef9 + 0852b51
commit c6cbd98
Show file tree

Hide file tree

Showing 29 changed files with 134 additions and 125 deletions.
diff --git a/install_template/deploy.mjs b/install_template/deploy.mjs
@@ -243,8 +243,6 @@ const moveDoc = async (product, platform, version) => {
       (ctx) => `epas/12/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_deb11_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "EDB Postgres Advanced Server", version: 12}, platform: {name: "Ubuntu 18.04"}}, 
       (ctx) => `epas/12/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "EDB Postgres Advanced Server", version: 12}, platform: {name: "Ubuntu 20.04"}}, 
-      (ctx) => `epas/12/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
 
     when({product: {name: "EDB Postgres Advanced Server", version: 11}, platform: {name: "CentOS 7"}}, 
       (ctx) => `epas/11/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_centos7_${fmtArchFilename(ctx)}.mdx`),
@@ -262,14 +260,10 @@ const moveDoc = async (product, platform, version) => {
       (ctx) => `epas/11/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_sles12_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "EDB Postgres Advanced Server", version: 11}, platform: {name: "SLES 15"}}, 
       (ctx) => `epas/11/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_sles15_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "EDB Postgres Advanced Server", version: 11}, platform: {name: "Debian 10"}}, 
-      (ctx) => `epas/11/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_deb10_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "EDB Postgres Advanced Server", version: 11}, platform: {name: "Debian 11"}}, 
       (ctx) => `epas/11/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_deb11_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "EDB Postgres Advanced Server", version: 11}, platform: {name: "Ubuntu 18.04"}}, 
       (ctx) => `epas/11/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "EDB Postgres Advanced Server", version: 11}, platform: {name: "Ubuntu 20.04"}}, 
-      (ctx) => `epas/11/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
 
 
     when({product: {name: "Failover Manager", version: 4}, platform: {name: "CentOS 7"}}, 

diff --git a/install_template/templates/products/edb-odbc-connector/base.njk b/install_template/templates/products/edb-odbc-connector/base.njk
@@ -3,3 +3,10 @@
 {% block prodprereq %}{% include "platformBase/_epasinstalldiffserver.njk" %}
 
 {% endblock prodprereq %}
+{% block installCommand %}{% block odbcconnector %}
+```shell
+sudo {{packageManager}} -y install {{ packageName }}
+sudo {{packageManager}} -y install {{ packageName }}-devel
+```
+{% endblock odbcconnector %}{% endblock installCommand %}
+
diff --git a/install_template/templates/products/edb-odbc-connector/debian.njk b/install_template/templates/products/edb-odbc-connector/debian.njk
@@ -1,7 +1,7 @@
 {% extends "products/edb-odbc-connector/base.njk" %}
 {% block odbcconnector %}
 ```shell
-sudo apt-get install {{ packageName }}
-sudo apt-get install {{ packageName }}-dev
+sudo {{packageManager}} -y install {{ packageName }}
+sudo {{packageManager}} -y install {{ packageName }}-dev
 ```
 {% endblock odbcconnector %}
diff --git a/install_template/templates/products/edb-odbc-connector/sles-12.njk b/install_template/templates/products/edb-odbc-connector/sles-12.njk
@@ -1,2 +1,8 @@
 {% extends "products/edb-odbc-connector/base.njk" %}
-{% set platformBaseTemplate = "sles-12" %}
+{% set platformBaseTemplate = "sles-12" %}
+{% block odbcconnector %}
+```shell
+sudo {{packageManager}} -n install {{ packageName }}
+sudo {{packageManager}} -n install {{ packageName }}-devel
+```
+{% endblock odbcconnector %}
diff --git a/install_template/templates/products/edb-odbc-connector/sles-15.njk b/install_template/templates/products/edb-odbc-connector/sles-15.njk
@@ -1,2 +1,8 @@
 {% extends "products/edb-odbc-connector/base.njk" %}
-{% set platformBaseTemplate = "sles-15" %}
+{% set platformBaseTemplate = "sles-15" %}
+{% block odbcconnector %}
+```shell
+sudo {{packageManager}} -n install {{ packageName }}
+sudo {{packageManager}} -n install {{ packageName }}-devel
+```
+{% endblock odbcconnector %}
diff --git a/install_template/templates/products/edb-odbc-connector/ubuntu.njk b/install_template/templates/products/edb-odbc-connector/ubuntu.njk
@@ -1,7 +1,7 @@
 {% extends "products/edb-odbc-connector/base.njk" %}
 {% block odbcconnector %}
 ```shell
-sudo apt-get install {{ packageName }}
-sudo apt-get install {{ packageName }}-dev
+sudo {{packageManager}} -y install {{ packageName }}
+sudo {{packageManager}} -y install {{ packageName }}-dev
 ```
 {% endblock odbcconnector %}