ISSUE-74 (#160)

paunin · May 28, 2018 · cb079a6 · cb079a6
1 parent 3e88b95
commit cb079a6
Show file tree

Hide file tree

Showing 60 changed files with 648 additions and 93 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
+##               BUILD_NUMBER=Mon May 28 16:58:37 +07 2018              ##
 ##########################################################################
 
 sudo: required

diff --git a/README.md b/README.md
@@ -156,7 +156,7 @@ But nevertheless you are able to play with `NODE_PRIORITY` environment variable
 
 If you have need to organize your cluster with some tricky logic or less problematic cross checks. You can enable SSH server on each node. Just set ENV variable `SSH_ENABLE=1` (disabled by default) in all containers (including pgpool and barman). That will allow you to connect from any to any node by simple command under `postgres` user: `gosu postgres ssh {NODE NETWORK NAME}`
 
-You might want to change default ssh keys which are put into the cluster. For that you need to mount files with your keys in paths `/home/postgres/.ssh/id_rsa`, `/home/postgres/.ssh/id_rsa.pub`.
+You also will have to set identical ssh keys to all containers. For that you need to mount files with your keys in paths `/home/postgres/.ssh/keys/id_rsa`, `/home/postgres/.ssh/keys/id_rsa.pub`.
 
 
 ## Replication slots

diff --git a/docker-compose/latest.yml b/docker-compose/latest.yml
@@ -1 +1 @@
-./postgres-10_pgpool-3.7_barman-2.3.yml
+postgres-10_pgpool-3.7_barman-2.4.yml
diff --git a/docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
+##               BUILD_NUMBER=Mon May 28 16:58:37 +07 2018              ##
 ##########################################################################
 
 version: '2'
@@ -51,6 +51,7 @@ services:
             - 5422:5432
         volumes:
             - pgmaster:/var/lib/postgresql/data
+            - ./ssh/:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -64,7 +65,7 @@ services:
             NODE_ID: 2
             NODE_NAME: node2
             CLUSTER_NODE_NETWORK_NAME: pgslave1 # (default: hostname of the node)
-
+            SSH_ENABLE: 1
             PARTNER_NODES: "pgmaster,pgslave1,pgslave3"
             REPLICATION_PRIMARY_HOST: pgmaster
             CLEAN_OVER_REWIND: 1
@@ -74,6 +75,7 @@ services:
             - 5441:5432
         volumes:
             - pgslave1:/var/lib/postgresql/data
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -164,6 +166,7 @@ services:
             BACKUP_SCHEDULE: "*/30 */5 * * *"
         volumes:
             - backup:/var/backups
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -196,6 +199,8 @@ services:
         ports:
             - 5430:5432
             - 9898:9898 # PCP
+        volumes:
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:

diff --git a/docker-compose/postgres-10_pgpool-3.3_barman-2.4.yml b/docker-compose/postgres-10_pgpool-3.3_barman-2.4.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
+##               BUILD_NUMBER=Mon May 28 16:58:37 +07 2018              ##
 ##########################################################################
 
 version: '2'
@@ -51,6 +51,7 @@ services:
             - 5422:5432
         volumes:
             - pgmaster:/var/lib/postgresql/data
+            - ./ssh/:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -64,7 +65,7 @@ services:
             NODE_ID: 2
             NODE_NAME: node2
             CLUSTER_NODE_NETWORK_NAME: pgslave1 # (default: hostname of the node)
-
+            SSH_ENABLE: 1
             PARTNER_NODES: "pgmaster,pgslave1,pgslave3"
             REPLICATION_PRIMARY_HOST: pgmaster
             CLEAN_OVER_REWIND: 1
@@ -74,6 +75,7 @@ services:
             - 5441:5432
         volumes:
             - pgslave1:/var/lib/postgresql/data
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -164,6 +166,7 @@ services:
             BACKUP_SCHEDULE: "*/30 */5 * * *"
         volumes:
             - backup:/var/backups
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -196,6 +199,8 @@ services:
         ports:
             - 5430:5432
             - 9898:9898 # PCP
+        volumes:
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:

diff --git a/docker-compose/postgres-10_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-10_pgpool-3.6_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
+##               BUILD_NUMBER=Mon May 28 16:58:37 +07 2018              ##
 ##########################################################################
 
 version: '2'
@@ -51,6 +51,7 @@ services:
             - 5422:5432
         volumes:
             - pgmaster:/var/lib/postgresql/data
+            - ./ssh/:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -64,7 +65,7 @@ services:
             NODE_ID: 2
             NODE_NAME: node2
             CLUSTER_NODE_NETWORK_NAME: pgslave1 # (default: hostname of the node)
-
+            SSH_ENABLE: 1
             PARTNER_NODES: "pgmaster,pgslave1,pgslave3"
             REPLICATION_PRIMARY_HOST: pgmaster
             CLEAN_OVER_REWIND: 1
@@ -74,6 +75,7 @@ services:
             - 5441:5432
         volumes:
             - pgslave1:/var/lib/postgresql/data
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -164,6 +166,7 @@ services:
             BACKUP_SCHEDULE: "*/30 */5 * * *"
         volumes:
             - backup:/var/backups
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -196,6 +199,8 @@ services:
         ports:
             - 5430:5432
             - 9898:9898 # PCP
+        volumes:
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:

diff --git a/docker-compose/postgres-10_pgpool-3.6_barman-2.4.yml b/docker-compose/postgres-10_pgpool-3.6_barman-2.4.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
+##               BUILD_NUMBER=Mon May 28 16:58:37 +07 2018              ##
 ##########################################################################
 
 version: '2'
@@ -51,6 +51,7 @@ services:
             - 5422:5432
         volumes:
             - pgmaster:/var/lib/postgresql/data
+            - ./ssh/:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -64,7 +65,7 @@ services:
             NODE_ID: 2
             NODE_NAME: node2
             CLUSTER_NODE_NETWORK_NAME: pgslave1 # (default: hostname of the node)
-
+            SSH_ENABLE: 1
             PARTNER_NODES: "pgmaster,pgslave1,pgslave3"
             REPLICATION_PRIMARY_HOST: pgmaster
             CLEAN_OVER_REWIND: 1
@@ -74,6 +75,7 @@ services:
             - 5441:5432
         volumes:
             - pgslave1:/var/lib/postgresql/data
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -164,6 +166,7 @@ services:
             BACKUP_SCHEDULE: "*/30 */5 * * *"
         volumes:
             - backup:/var/backups
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -196,6 +199,8 @@ services:
         ports:
             - 5430:5432
             - 9898:9898 # PCP
+        volumes:
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:

diff --git a/docker-compose/postgres-10_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-10_pgpool-3.7_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
+##               BUILD_NUMBER=Mon May 28 16:58:37 +07 2018              ##
 ##########################################################################
 
 version: '2'
@@ -51,6 +51,7 @@ services:
             - 5422:5432
         volumes:
             - pgmaster:/var/lib/postgresql/data
+            - ./ssh/:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -64,7 +65,7 @@ services:
             NODE_ID: 2
             NODE_NAME: node2
             CLUSTER_NODE_NETWORK_NAME: pgslave1 # (default: hostname of the node)
-
+            SSH_ENABLE: 1
             PARTNER_NODES: "pgmaster,pgslave1,pgslave3"
             REPLICATION_PRIMARY_HOST: pgmaster
             CLEAN_OVER_REWIND: 1
@@ -74,6 +75,7 @@ services:
             - 5441:5432
         volumes:
             - pgslave1:/var/lib/postgresql/data
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -164,6 +166,7 @@ services:
             BACKUP_SCHEDULE: "*/30 */5 * * *"
         volumes:
             - backup:/var/backups
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:
@@ -196,6 +199,8 @@ services:
         ports:
             - 5430:5432
             - 9898:9898 # PCP
+        volumes:
+            - ./ssh:/home/postgres/.ssh/keys
         networks:
             cluster:
                 aliases:

diff --git a/docker-compose/postgres-10_pgpool-3.7_barman-2.4.yml b/docker-compose/postgres-10_pgpool-3.7_barman-2.4.yml