Merge pull request #2840 from EnterpriseDB/release/2022-06-22

Release: 2022-06-22
EnterpriseDB · Jun 22, 2022 · df7d792 · df7d792
2 parents e72a9d4 + 62f7843
commit df7d792
Show file tree

Hide file tree

Showing 64 changed files with 1,163 additions and 693 deletions.
diff --git a/install_template/config.yaml b/install_template/config.yaml
@@ -575,3 +575,41 @@ products:
       - name: SLES 15
         arch: ppc64le
         supported versions: [8]
+  - name: Replication Server
+    platforms:
+      - name: CentOS 7
+        arch: x86_64
+        supported versions: [7]
+      - name: CentOS 7
+        arch: ppc64le
+        supported versions: [7]
+      - name: AlmaLinux 8 or Rocky Linux 8
+        arch: x86_64
+        supported versions: [7]
+      - name: RHEL 7 or OL 7
+        arch: x86_64
+        supported versions: [7]
+      - name: RHEL 7 or OL 7
+        arch: ppc64le
+        supported versions: [7]
+      - name: RHEL 8 or OL 8
+        arch: x86_64
+        supported versions: [7]
+      - name: Ubuntu 18.04 or Debian 9
+        arch: x86_64
+        supported versions: [7]
+      - name: Ubuntu 20.04 or Debian 10
+        arch: x86_64
+        supported versions: [7]
+      - name: SLES 12
+        arch: x86_64
+        supported versions: [7]
+      - name: SLES 15
+        arch: x86_64
+        supported versions: [7]
+      - name: SLES 12
+        arch: ppc64le
+        supported versions: [7]
+      - name: SLES 15
+        arch: ppc64le
+        supported versions: [7]
diff --git a/install_template/deploy.mjs b/install_template/deploy.mjs
@@ -146,6 +146,10 @@ const moveDoc = async (product, platform, version) => {
       (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"}}, 
       (ctx) => `efm/4/03_installing_efm/${fmtArchPath(ctx)}/${prefix[plat]}_efm4_sles15_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "EDB Postgres Advanced Server"}, platform: {name: "SLES 12"}}, 
+      (ctx) => `epas/14/epas_inst_linux/installing_epas_using_edb_repository/${fmtArchPath(ctx)}/epas_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "EDB Postgres Advanced Server"}, platform: {name: "SLES 15"}}, 
+      (ctx) => `epas/14/epas_inst_linux/installing_epas_using_edb_repository//${fmtArchPath(ctx)}/epas_sles15_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Hadoop Foreign Data Wrapper"}, platform: {name: "SLES 12"}}, 
       (ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/${prefix[plat]}_hadoop_sles12_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Hadoop Foreign Data Wrapper"}, platform: {name: "SLES 15"}}, 
@@ -190,6 +194,10 @@ const moveDoc = async (product, platform, version) => {
       (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`),
+    when({product: {name: "Replication Server", version: 7}, platform: {name: "SLES 12"}}, 
+      (ctx) => `eprs/7/03_installation/03_installing_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_eprs_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "Replication Server", version: 7}, platform: {name: "SLES 15"}}, 
+      (ctx) => `eprs/7/03_installation/03_installing_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_eprs_sles15_${fmtArchFilename(ctx)}.mdx`),
   );
 
   function match(context, ...conditions) {

diff --git a/install_template/templates/platformBase/_shared.njk b/install_template/templates/platformBase/_shared.njk
@@ -12,6 +12,7 @@ sed -i "s@<username>:<password>@USERNAME:PASSWORD@" /etc/yum.repos.d/edb.repo
 #  Install EPEL repository and refresh the cache:
 {{ packageManager }} -y install {{ epelRepo }}
 {{ packageManager }} makecache
+{% block rhel_8_or_ol8 %}{% endblock rhel_8_or_ol8 %}
 ```
 {% endmacro %}
 

diff --git a/install_template/templates/platformBase/rhel-8-or-ol-8.njk b/install_template/templates/platformBase/rhel-8-or-ol-8.njk
@@ -4,12 +4,14 @@
 {% block prerequisites %}
 {{ centosRepositoryConfiguration("dnf", "https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm") }} 
 ```shell
+{% block rhel_8_or_ol8 %}
 #  Enable the codeready-builder-for-rhel-8-*-rpms repository since EPEL packages may depend on packages from it
 ARCH=$( /bin/arch )
 subscription-manager repos --enable "codeready-builder-for-rhel-8-${ARCH}-rpms"
 
 #  Disable the built-in PostgreSQL module:
 dnf -qy module disable postgresql
+{% endblock rhel_8_or_ol8 %}
 ```
 {% endblock prerequisites %}
 {% block installCommand %}

diff --git a/install_template/templates/platformBase/sles-15.njk b/install_template/templates/platformBase/sles-15.njk
@@ -1,4 +1,3 @@
-
 {% extends "platformBase/sles-12.njk" %}
 {% block activateSUSEmodule %}
 SUSEConnect -p PackageHub/15.3/{{ platform.arch }}

diff --git a/...e/templates/products/edb-postgres-advanced-server/_centos-rhel-connectdatabasecluster.njk b/...e/templates/products/edb-postgres-advanced-server/_centos-rhel-connectdatabasecluster.njk
diff --git a/...all_template/templates/products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk b/...all_template/templates/products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk
diff --git a/...template/templates/products/edb-postgres-advanced-server/almalinux-8-or-rocky-linux-8.njk b/...template/templates/products/edb-postgres-advanced-server/almalinux-8-or-rocky-linux-8.njk
@@ -2,21 +2,12 @@
 {% set platformBaseTemplate = "almalinux-8-or-rocky-linux-8" %}
 {% block prerequisites %}
 {{ super() }}
-1. Disable the built-in PostgreSQL module:
-
-   ```sh
-   dnf -qy module disable postgresql
-   ```
+```shell
+# Disable the built-in PostgreSQL module:
+dnf -qy module disable postgresql
+```
 {% endblock prerequisites %}
 {% block installCommand %}
 {{ super() }}
 {% include "products/edb-postgres-advanced-server/_centos-rhel-installcommand.njk" %}
-{% endblock installCommand %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
-{% block connectdatabasecluster %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-connectdatabasecluster.njk" %}
-{{ super() }}
-{% endblock connectdatabasecluster %}
+{% endblock installCommand %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/base.njk b/install_template/templates/products/edb-postgres-advanced-server/base.njk
@@ -1,72 +1,52 @@
 {% extends "platformBase/" + platformBaseTemplate + '.njk' %}
 {% set packageName %}edb-as<xx>-server{% endset %}
-{% block installCommand %}
-```shell
-zypper -n install {{ packageName }}
-```
-Where xx is the version of EDB Postgres Advanced Server you are installing.
-{% endblock installCommand %}
-
 {% block postinstall %}
-## Connecting to Your Database cluster
-
-This section steps you through getting started with your cluster including logging in, ensuring the installation and initial configuration was successful, connecting to your cluster, and creating the user password.
-
-{% block connectdatabasecluster %}{% endblock connectdatabasecluster %}
-1. To work in your cluster, login as `enterprisedb` user:
-
-   ```sh
-   su - enterprisedb
-   ```
-   See [Managing Your Cluster > Managing Services], for more information.
-
-1. Connect to the database server using psql command line client:
-
-   ```sh
-   psql edb
-   ```
-   See [Managing Your Cluster > Connecting to Your Cluster], for more information including how to use pgAdmin4 to connect to your cluster using its graphical interface.
-
-1. Then, assign a password to the database superuser `enterprisedb`:
+Where `<xx>` is the version of the EDB Postgres Advanced server you are installing.
 
-   ```sh
-   ALTER ROLE enterprisedb IDENTIFIED BY password;
-   ```
+{% block individual_component %}{% endblock individual_component %}
 
-## Creating a Database
+## Initial configuration
 
-This section steps you through creating and adding data to a simple database.
-
-1. Create a database (named hr):
-
-   ```sh
-   CREATE DATABASE hr;
-   ```
-
-1. Connect to the new database and create a table (named dept):
-
-   ```sh
-   \c hr
-   CREATE TABLE public.dept (deptno numeric(2) NOT NULL CONSTRAINT dept_pk
-   PRIMARY KEY, dname varchar(14) CONSTRAINT dept_dname_uq UNIQUE, loc
-   varchar(13));
-   ```
-
-1. Add data to the table:
-
-   ```sh
-   INSERT INTO dept VALUES (10,'ACCOUNTING','NEW YORK');
-   INSERT into dept VALUES (20,'RESEARCH','DALLAS');
-   ```
-
-1. You can use simple SQL commands to query the database and retrieve information about the data you have added to the table:
+{% block debian_ubuntu %}
+This section steps you through getting started with your cluster including logging in, ensuring the installation and initial configuration was successful, connecting to your cluster, and creating the user password.
 
-   ```sh
-   SELECT * FROM dept;
-   deptno  |   dname    |   loc
-   --------+------------+----------
-   10      | ACCOUNTING | NEW YORK
-   20      | RESEARCH   | DALLAS
-   (2 rows)
-   ```
+```shell
+# Initialize the database cluster
+PGSETUP_INITDB_OPTIONS="-E UTF-8" /usr/edb/as{{ product.version }}/bin/edb-as-{{ product.version | replace(".", "") }}-setup initdb
+
+# Start the database cluster
+systemctl start edb-as-{{ product.version }}
+{% endblock debian_ubuntu %}
+
+# To work in your cluster, login as the enterprisedb user
+su - enterprisedb
+
+# Connect to the database server using the psql command line client
+psql edb
+
+# Assign a password to the database superuser the enterprisedb
+ALTER ROLE enterprisedb IDENTIFIED BY password;
+
+# Create a database (named hr)
+CREATE DATABASE hr;
+
+# Connect to the new database and create a table (named dept)
+\c hr
+CREATE TABLE public.dept (deptno numeric(2) NOT NULL CONSTRAINT dept_pk
+PRIMARY KEY, dname varchar(14) CONSTRAINT dept_dname_uq UNIQUE, loc
+varchar(13));
+
+# Add data to the table
+INSERT INTO dept VALUES (10,'ACCOUNTING','NEW YORK');
+INSERT into dept VALUES (20,'RESEARCH','DALLAS');
+
+# You can use simple SQL commands to query the database and retrieve 
+# information about the data you have added to the table
+SELECT * FROM dept;
+deptno  |   dname    |   loc
+--------+------------+----------
+10      | ACCOUNTING | NEW YORK
+20      | RESEARCH   | DALLAS
+(2 rows)
+```
 {% endblock postinstall %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/centos-7.njk b/install_template/templates/products/edb-postgres-advanced-server/centos-7.njk
@@ -3,12 +3,4 @@
 {% block installCommand %}
 {{ super() }}
 {% include "products/edb-postgres-advanced-server/_centos-rhel-installcommand.njk" %}
-{% endblock installCommand %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
-{% block connectdatabasecluster %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-connectdatabasecluster.njk" %}
-{{ super() }}
-{% endblock connectdatabasecluster %}
+{% endblock installCommand %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/debian-10.njk b/install_template/templates/products/edb-postgres-advanced-server/debian-10.njk
@@ -1,6 +1,5 @@
 {% extends "products/edb-postgres-advanced-server/base.njk" %}
 {% set platformBaseTemplate = "debian-10" %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_debian-initialconfiguration.njk" %}
-{{ super() }}
-{% endblock postinstall %}
+{% block debian_ubuntu %}
+For Debian/Ubuntu platforms, initializing and starting of the database cluster is done along with the package installation.
+{% endblock debian_ubuntu %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/debian-9.njk b/install_template/templates/products/edb-postgres-advanced-server/debian-9.njk
@@ -1,6 +1,5 @@
 {% extends "products/edb-postgres-advanced-server/base.njk" %}
 {% set platformBaseTemplate = "debian-9" %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_debian-initialconfiguration.njk" %}
-{{ super() }}
-{% endblock postinstall %}
+{% block debian_ubuntu %}
+For Debian/Ubuntu platforms, initializing and starting of the database cluster is done along with the package installation.
+{% endblock debian_ubuntu %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/rhel-7-or-ol-7.njk b/install_template/templates/products/edb-postgres-advanced-server/rhel-7-or-ol-7.njk
@@ -3,8 +3,4 @@
 {% block installCommand %}
 {{ super() }}
 {% include "products/edb-postgres-advanced-server/_centos-rhel-installcommand.njk" %}
-{% endblock installCommand %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
+{% endblock installCommand %}
diff --git a/...l_template/templates/products/edb-postgres-advanced-server/rhel-8-or-centos-8-or-ol-8.njk b/...l_template/templates/products/edb-postgres-advanced-server/rhel-8-or-centos-8-or-ol-8.njk
diff --git a/install_template/templates/products/edb-postgres-advanced-server/rhel-8-or-ol-8.njk b/install_template/templates/products/edb-postgres-advanced-server/rhel-8-or-ol-8.njk
@@ -3,8 +3,4 @@
 {% block installCommand %}
 {{ super() }}
 {% include "products/edb-postgres-advanced-server/_centos-rhel-installcommand.njk" %}
-{% endblock installCommand %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
+{% endblock installCommand %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/sles-12.njk b/install_template/templates/products/edb-postgres-advanced-server/sles-12.njk
@@ -1,6 +1,11 @@
 {% extends "products/edb-postgres-advanced-server/base.njk" %}
 {% set platformBaseTemplate = "sles-12" %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
+{% block individual_component %}
+To install an individual component:
+
+```shell
+zypper install <package_name>
+```
+
+Where `package_name` can be any of the available package from the [available package list](https://www.enterprisedb.com/docs/epas/latest/epas_inst_linux/install_details/rpm_packages/).
+{% endblock individual_component %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/sles-12_ppc64le.njk b/install_template/templates/products/edb-postgres-advanced-server/sles-12_ppc64le.njk
@@ -1,6 +1,2 @@
-{% extends "products/edb-postgres-advanced-server/base.njk" %}
-{% set platformBaseTemplate = "sles-12" %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
+{% extends "products/edb-postgres-advanced-server/sles-12.njk" %}
+{% set includePPC = true %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/sles-15.njk b/install_template/templates/products/edb-postgres-advanced-server/sles-15.njk
@@ -1,6 +1,11 @@
 {% extends "products/edb-postgres-advanced-server/base.njk" %}
 {% set platformBaseTemplate = "sles-15" %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
+{% block individual_component %}
+To install an individual component:
+
+```shell
+zypper install <package_name>
+```
+
+Where `package_name` can be any of the available package from the [available package list](https://www.enterprisedb.com/docs/epas/latest/epas_inst_linux/install_details/rpm_packages/).
+{% endblock individual_component %}
diff --git a/install_template/templates/products/edb-postgres-advanced-server/sles-15_ppc64le.njk b/install_template/templates/products/edb-postgres-advanced-server/sles-15_ppc64le.njk
@@ -1,7 +1,2 @@
-{% extends "products/edb-postgres-advanced-server/base.njk" %}
-{% set platformBaseTemplate = "sles-15" %}
+{% extends "products/edb-postgres-advanced-server/sles-15.njk" %}
 {% set includePPC = true %}
-{% block postinstall %}
-{% include "products/edb-postgres-advanced-server/_centos-rhel-postinstall.njk" %}
-{{ super() }}
-{% endblock postinstall %}
diff --git a/install_template/templates/products/replication-server/almalinux-8-or-rocky-linux-8.njk b/install_template/templates/products/replication-server/almalinux-8-or-rocky-linux-8.njk
@@ -0,0 +1,10 @@
+{% extends "products/replication-server/base.njk" %}
+{% set platformBaseTemplate = "almalinux-8-or-rocky-linux-8" %}
+{% block prerequisites %}
+{{ super() }}
+1. Disable the built-in PostgreSQL module:
+
+   ```sh
+   dnf -qy module disable postgresql
+   ```
+{% endblock prerequisites %}