diff --git a/.travis.yml b/.travis.yml index c975e258..82114840 100644 --- 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 index d6b718fb..e906a7e4 100644 --- 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 index 12f8592f..5fd625c0 120000 --- a/docker-compose/latest.yml +++ b/docker-compose/latest.yml @@ -1 +1 @@ -./postgres-10_pgpool-3.7_barman-2.3.yml \ No newline at end of file +postgres-10_pgpool-3.7_barman-2.4.yml \ No newline at end of file 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 index a51d8dec..268a83da 100644 --- 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 index 35d1a811..b82bba1f 100644 --- 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 index fccfe12c..217813c3 100644 --- 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 index 51dc1a73..d6c6ea73 100644 --- 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 index 1761cafd..653c53ea 100644 --- 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 deleted file mode 120000 index bfad67a1..00000000 --- a/docker-compose/postgres-10_pgpool-3.7_barman-2.4.yml +++ /dev/null @@ -1 +0,0 @@ -latest.yml \ No newline at end of file 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 new file mode 100644 index 00000000..298faa48 --- /dev/null +++ b/docker-compose/postgres-10_pgpool-3.7_barman-2.4.yml @@ -0,0 +1,300 @@ + +########################################################################## +## AUTO-GENERATED FILE ## +## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ## +########################################################################## + +version: '2' +networks: + cluster: + driver: bridge + +volumes: + pgmaster: + pgslave1: + pgslave2: + pgslave3: + pgslave4: + backup: + +services: + pgmaster: + build: + context: ../src + dockerfile: Postgres-10-Repmgr-3.2.Dockerfile + environment: + NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045) + NODE_NAME: node1 # Node name + CLUSTER_NODE_NETWORK_NAME: pgmaster # (default: hostname of the node) + + PARTNER_NODES: "pgmaster,pgslave1,pgslave3" + REPLICATION_PRIMARY_HOST: pgmaster # That should be ignored on the same node + + NODE_PRIORITY: 100 # (default: 100) + SSH_ENABLE: 1 + #database we want to use for application + POSTGRES_PASSWORD: monkey_pass + POSTGRES_USER: monkey_user + POSTGRES_DB: monkey_db + CLEAN_OVER_REWIND: 0 + CONFIGS_DELIMITER_SYMBOL: ; + CONFIGS: "listen_addresses:'*';max_replication_slots:5" + # in format variable1:value1[,variable2:value2[,...]] if CONFIGS_DELIMITER_SYMBOL=, and CONFIGS_ASSIGNMENT_SYMBOL=: + # used for pgpool.conf file + #defaults: + CLUSTER_NAME: pg_cluster # default is pg_cluster + REPLICATION_DB: replication_db # default is replication_db + REPLICATION_USER: replication_user # default is replication_user + REPLICATION_PASSWORD: replication_pass # default is replication_pass + + ports: + - 5422:5432 + volumes: + - pgmaster:/var/lib/postgresql/data + - ./ssh/:/home/postgres/.ssh/keys + networks: + cluster: + aliases: + - pgmaster +#<<< Branch 1 + pgslave1: + build: + context: ../src + dockerfile: Postgres-10-Repmgr-3.2.Dockerfile + environment: + 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 + CONFIGS_DELIMITER_SYMBOL: ; + CONFIGS: "max_replication_slots:10" #some overrides + ports: + - 5441:5432 + volumes: + - pgslave1:/var/lib/postgresql/data + - ./ssh:/home/postgres/.ssh/keys + networks: + cluster: + aliases: + - pgslave1 + + # Add more slaves if required + pgslave2: + build: + context: ../src + dockerfile: Postgres-10-Repmgr-3.2.Dockerfile + environment: + NODE_ID: 3 + NODE_NAME: node3 + CLUSTER_NODE_NETWORK_NAME: pgslave2 # (default: hostname of the node) + + REPLICATION_PRIMARY_HOST: pgslave1 # I want to have cascade Streeming replication + #USE_REPLICATION_SLOTS: 0 + CONFIGS_DELIMITER_SYMBOL: ; + CONFIGS: "listen_addresses:'*'" + ports: + - 5442:5432 + volumes: + - pgslave2:/var/lib/postgresql/data + networks: + cluster: + aliases: + - pgslave2 +#>>> Branch 1 +#<<< Branch 2 + pgslave3: + build: + context: ../src + dockerfile: Postgres-10-Repmgr-3.2.Dockerfile + environment: + NODE_ID: 4 + NODE_NAME: node4 + CLUSTER_NODE_NETWORK_NAME: pgslave3 # (default: hostname of the node) + + PARTNER_NODES: "pgmaster,pgslave1,pgslave3" + REPLICATION_PRIMARY_HOST: pgmaster + NODE_PRIORITY: 200 # (default: 100) + CLEAN_OVER_REWIND: 1 + CONFIGS_DELIMITER_SYMBOL: ; + CONFIGS: "listen_addresses:'*'" + ports: + - 5443:5432 + volumes: + - pgslave3:/var/lib/postgresql/data + networks: + cluster: + aliases: + - pgslave3 + + pgslave4: + build: + context: ../src + dockerfile: Postgres-10-Repmgr-3.2.Dockerfile + environment: + NODE_ID: 5 + NODE_NAME: node5 + CLUSTER_NODE_NETWORK_NAME: pgslave4 # (default: hostname of the node) + + REPLICATION_PRIMARY_HOST: pgslave3 + #USE_REPLICATION_SLOTS: 0 + CONFIGS_DELIMITER_SYMBOL: ; + CONFIGS: "listen_addresses:'*'" + ports: + - 5444:5432 + volumes: + - pgslave4:/var/lib/postgresql/data + networks: + cluster: + aliases: + - pgslave4 +#>>> Branch 2 + backup: + build: + context: ../src + dockerfile: Barman-2.4-Postgres-10.Dockerfile + environment: + REPLICATION_USER: replication_user # default is replication_user + REPLICATION_PASSWORD: replication_pass # default is replication_pass + REPLICATION_HOST: pgmaster + POSTGRES_PASSWORD: monkey_pass + POSTGRES_USER: monkey_user + POSTGRES_DB: monkey_db + SSH_ENABLE: 1 + BACKUP_SCHEDULE: "*/30 */5 * * *" + volumes: + - backup:/var/backups + - ./ssh:/home/postgres/.ssh/keys + networks: + cluster: + aliases: + - backup + pgpool: + build: + context: ../src + dockerfile: Pgpool-3.7-Postgres-10.Dockerfile + environment: + PCP_USER: pcp_user + PCP_PASSWORD: pcp_pass + WAIT_BACKEND_TIMEOUT: 60 + + CHECK_USER: monkey_user + CHECK_PASSWORD: monkey_pass + CHECK_PGCONNECT_TIMEOUT: 3 #timout for checking if primary node is healthy + SSH_ENABLE: 1 + DB_USERS: monkey_user:monkey_pass # in format user:password[,user:password[...]] + BACKENDS: "0:pgmaster:5432:1:/var/lib/postgresql/data:ALLOW_TO_FAILOVER,1:pgslave1::::,3:pgslave3::::,2:pgslave2::::" #,4:pgslaveDOES_NOT_EXIST:::: + # in format num:host:port:weight:data_directory:flag[,...] + # defaults: + # port: 5432 + # weight: 1 + # data_directory: /var/lib/postgresql/data + # flag: ALLOW_TO_FAILOVER + REQUIRE_MIN_BACKENDS: 3 # minimal number of backends to start pgpool (some might be unreachable) + CONFIGS: "num_init_children:250,max_pool:4" + # in format variable1:value1[,variable2:value2[,...]] if CONFIGS_DELIMITER_SYMBOL=, and CONFIGS_ASSIGNMENT_SYMBOL=: + # used for pgpool.conf file + ports: + - 5430:5432 + - 9898:9898 # PCP + volumes: + - ./ssh:/home/postgres/.ssh/keys + networks: + cluster: + aliases: + - pgpool +# the rest is for tests + postgres_ext: + build: + context: ../src + dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile + environment: + NODE_ID: 101 + NODE_NAME: node101 # Node name + CLUSTER_NODE_NETWORK_NAME: postgres_ext # (default: hostname of the node) + POSTGRES_PASSWORD: monkey_pass + POSTGRES_USER: monkey_user + POSTGRES_DB: monkey_db + CLEAN_OVER_REWIND: 0 + CONFIGS_DELIMITER_SYMBOL: ; + CONFIGS: "listen_addresses:'*';shared_preload_libraries:'pglogical'" + postgres_conf: + build: + context: ../src/ + dockerfile: Postgres-10-Repmgr-3.2.Dockerfile + environment: + NODE_NAME: node-102 # Node name + CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node) + POSTGRES_PASSWORD: monkey_pass + POSTGRES_USER: monkey_user + POSTGRES_DB: monkey_db + CLEAN_OVER_REWIND: 0 + CONFIGS: "listen_addresses)'some_host'|max_replication_slots)55" + CONFIGS_DELIMITER_SYMBOL: "|" + CONFIGS_ASSIGNMENT_SYMBOL: ")" + pgpool_conf: + build: + context: ../src + dockerfile: Pgpool-3.7-Postgres-10.Dockerfile + environment: + PCP_USER: pcp_user + PCP_PASSWORD: pcp_pass + + CHECK_USER: monkey_user + CHECK_PASSWORD: monkey_pass + + CHECK_PGCONNECT_TIMEOUT: 3 #timout for checking if primary node is healthy + DB_USERS: monkey_user:monkey_pass # in format user:password[,user:password[...]] + CONFIGS: "num_init_children)12|max_pool)13" + CONFIGS_DELIMITER_SYMBOL: "|" + CONFIGS_ASSIGNMENT_SYMBOL: ")" + ports: + - 5440:5432 + - 9897:9898 # PCP + pgmaster2: + build: + context: ../src + dockerfile: Postgres-10-Repmgr-3.2.Dockerfile + environment: + + NODE_ID: 1 + NODE_NAME: node1 + CLUSTER_NODE_NETWORK_NAME: pgmaster2 + + POSTGRES_PASSWORD: monkey_pass + POSTGRES_USER: monkey_user + POSTGRES_DB: monkey_db + CONFIGS_DELIMITER_SYMBOL: ; + CONFIGS: "listen_addresses:'*'" + ports: + - 5439:5432 + networks: + cluster: + aliases: + - pgmaster2 + pgpool2: + build: + context: ../src + dockerfile: Pgpool-3.7-Postgres-10.Dockerfile + depends_on: + - pgmaster + - pgmaster2 + environment: + PCP_USER: pcp_user + PCP_PASSWORD: pcp_pass + + CHECK_USER: monkey_user + CHECK_PASSWORD: monkey_pass + CHECK_PGCONNECT_TIMEOUT: 3 #timout for checking if primary node is healthy + + DB_USERS: monkey_user:monkey_pass # in format user:password[,user:password[...]] + BACKENDS: "0:pgmaster::::,1:pgmaster2::::" + ports: + - 5431:5432 + - 9899:9898 # PCP + networks: + cluster: + aliases: + - pgpool2 \ No newline at end of file diff --git a/docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml index 2af1e4ba..1848b9ad 100644 --- a/docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml +++ b/docker-compose/postgres-9.5_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-9.5_pgpool-3.3_barman-2.4.yml b/docker-compose/postgres-9.5_pgpool-3.3_barman-2.4.yml index c26362ac..2ef8fd86 100644 --- a/docker-compose/postgres-9.5_pgpool-3.3_barman-2.4.yml +++ b/docker-compose/postgres-9.5_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-9.5_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-9.5_pgpool-3.6_barman-2.3.yml index d44b70ee..349474fa 100644 --- a/docker-compose/postgres-9.5_pgpool-3.6_barman-2.3.yml +++ b/docker-compose/postgres-9.5_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-9.5_pgpool-3.6_barman-2.4.yml b/docker-compose/postgres-9.5_pgpool-3.6_barman-2.4.yml index 73350e9c..4be0725a 100644 --- a/docker-compose/postgres-9.5_pgpool-3.6_barman-2.4.yml +++ b/docker-compose/postgres-9.5_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-9.5_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-9.5_pgpool-3.7_barman-2.3.yml index 305f2c37..242d3771 100644 --- a/docker-compose/postgres-9.5_pgpool-3.7_barman-2.3.yml +++ b/docker-compose/postgres-9.5_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-9.5_pgpool-3.7_barman-2.4.yml b/docker-compose/postgres-9.5_pgpool-3.7_barman-2.4.yml index 65b65b40..e2bb4a07 100644 --- a/docker-compose/postgres-9.5_pgpool-3.7_barman-2.4.yml +++ b/docker-compose/postgres-9.5_pgpool-3.7_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-9.6_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-9.6_pgpool-3.3_barman-2.3.yml index 3a7af8ba..48e52cce 100644 --- a/docker-compose/postgres-9.6_pgpool-3.3_barman-2.3.yml +++ b/docker-compose/postgres-9.6_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-9.6_pgpool-3.3_barman-2.4.yml b/docker-compose/postgres-9.6_pgpool-3.3_barman-2.4.yml index 67fd40cc..ee6d324f 100644 --- a/docker-compose/postgres-9.6_pgpool-3.3_barman-2.4.yml +++ b/docker-compose/postgres-9.6_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-9.6_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-9.6_pgpool-3.6_barman-2.3.yml index a03fa7a2..756f94a2 100644 --- a/docker-compose/postgres-9.6_pgpool-3.6_barman-2.3.yml +++ b/docker-compose/postgres-9.6_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-9.6_pgpool-3.6_barman-2.4.yml b/docker-compose/postgres-9.6_pgpool-3.6_barman-2.4.yml index 35ec00ff..f235c199 100644 --- a/docker-compose/postgres-9.6_pgpool-3.6_barman-2.4.yml +++ b/docker-compose/postgres-9.6_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-9.6_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-9.6_pgpool-3.7_barman-2.3.yml index 1ecde173..b1fb280e 100644 --- a/docker-compose/postgres-9.6_pgpool-3.7_barman-2.3.yml +++ b/docker-compose/postgres-9.6_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-9.6_pgpool-3.7_barman-2.4.yml b/docker-compose/postgres-9.6_pgpool-3.7_barman-2.4.yml index 603ba4bb..ce7b2344 100644 --- a/docker-compose/postgres-9.6_pgpool-3.7_barman-2.4.yml +++ b/docker-compose/postgres-9.6_pgpool-3.7_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-extended-10_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-extended-10_pgpool-3.3_barman-2.3.yml index 71f2857b..5d2ccc34 100644 --- a/docker-compose/postgres-extended-10_pgpool-3.3_barman-2.3.yml +++ b/docker-compose/postgres-extended-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-extended-10_pgpool-3.3_barman-2.4.yml b/docker-compose/postgres-extended-10_pgpool-3.3_barman-2.4.yml index 8be8b83b..bdf86fe6 100644 --- a/docker-compose/postgres-extended-10_pgpool-3.3_barman-2.4.yml +++ b/docker-compose/postgres-extended-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-extended-10_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-extended-10_pgpool-3.6_barman-2.3.yml index 7987dad5..f3e0bdf1 100644 --- a/docker-compose/postgres-extended-10_pgpool-3.6_barman-2.3.yml +++ b/docker-compose/postgres-extended-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-extended-10_pgpool-3.6_barman-2.4.yml b/docker-compose/postgres-extended-10_pgpool-3.6_barman-2.4.yml index 275347d2..6a53fe46 100644 --- a/docker-compose/postgres-extended-10_pgpool-3.6_barman-2.4.yml +++ b/docker-compose/postgres-extended-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-extended-10_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-extended-10_pgpool-3.7_barman-2.3.yml index 1d43db3d..2d2ea9a4 100644 --- a/docker-compose/postgres-extended-10_pgpool-3.7_barman-2.3.yml +++ b/docker-compose/postgres-extended-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-extended-10_pgpool-3.7_barman-2.4.yml b/docker-compose/postgres-extended-10_pgpool-3.7_barman-2.4.yml index 90a92c13..4005a5df 100644 --- a/docker-compose/postgres-extended-10_pgpool-3.7_barman-2.4.yml +++ b/docker-compose/postgres-extended-10_pgpool-3.7_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-extended-9.5_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.3.yml index b83b201b..467e84a9 100644 --- a/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.3.yml +++ b/docker-compose/postgres-extended-9.5_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-extended-9.5_pgpool-3.3_barman-2.4.yml b/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.4.yml index 6a0d21bb..a30662f4 100644 --- a/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.4.yml +++ b/docker-compose/postgres-extended-9.5_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-extended-9.5_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.3.yml index 47be7cc9..e8b6e10e 100644 --- a/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.3.yml +++ b/docker-compose/postgres-extended-9.5_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-extended-9.5_pgpool-3.6_barman-2.4.yml b/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.4.yml index 136a75bd..975e3673 100644 --- a/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.4.yml +++ b/docker-compose/postgres-extended-9.5_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-extended-9.5_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.3.yml index 71367bf1..9bae2532 100644 --- a/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.3.yml +++ b/docker-compose/postgres-extended-9.5_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-extended-9.5_pgpool-3.7_barman-2.4.yml b/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.4.yml index 99ed8dc4..1e0bd685 100644 --- a/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.4.yml +++ b/docker-compose/postgres-extended-9.5_pgpool-3.7_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-extended-9.6_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.3.yml index 8aa971f6..fef40012 100644 --- a/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.3.yml +++ b/docker-compose/postgres-extended-9.6_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-extended-9.6_pgpool-3.3_barman-2.4.yml b/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.4.yml index 902588b8..a484206f 100644 --- a/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.4.yml +++ b/docker-compose/postgres-extended-9.6_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-extended-9.6_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.3.yml index 424f14dc..cbb772f4 100644 --- a/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.3.yml +++ b/docker-compose/postgres-extended-9.6_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-extended-9.6_pgpool-3.6_barman-2.4.yml b/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.4.yml index cb6a67b2..55835d53 100644 --- a/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.4.yml +++ b/docker-compose/postgres-extended-9.6_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-extended-9.6_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.3.yml index 00a05f78..e0ee34d7 100644 --- a/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.3.yml +++ b/docker-compose/postgres-extended-9.6_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-extended-9.6_pgpool-3.7_barman-2.4.yml b/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.4.yml index e596fca9..0a82856a 100644 --- a/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.4.yml +++ b/docker-compose/postgres-extended-9.6_pgpool-3.7_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/src/ssh/id_rsa b/docker-compose/ssh/id_rsa similarity index 100% rename from src/ssh/id_rsa rename to docker-compose/ssh/id_rsa diff --git a/src/ssh/id_rsa.pub b/docker-compose/ssh/id_rsa.pub similarity index 100% rename from src/ssh/id_rsa.pub rename to docker-compose/ssh/id_rsa.pub diff --git a/src/Barman-2.3-Postgres-10.Dockerfile b/src/Barman-2.3-Postgres-10.Dockerfile index aed1bd17..7f2c0d3d 100644 --- a/src/Barman-2.3-Postgres-10.Dockerfile +++ b/src/Barman-2.3-Postgres-10.Dockerfile @@ -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 ## ########################################################################## FROM golang:1.8-jessie diff --git a/src/Barman-2.3-Postgres-9.6.Dockerfile b/src/Barman-2.3-Postgres-9.6.Dockerfile index bf9eaa47..e0d9d63b 100644 --- a/src/Barman-2.3-Postgres-9.6.Dockerfile +++ b/src/Barman-2.3-Postgres-9.6.Dockerfile @@ -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 ## ########################################################################## FROM golang:1.8-jessie diff --git a/src/Barman-2.4-Postgres-10.Dockerfile b/src/Barman-2.4-Postgres-10.Dockerfile deleted file mode 120000 index c9857577..00000000 --- a/src/Barman-2.4-Postgres-10.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -Barman-latest.Dockerfile \ No newline at end of file diff --git a/src/Barman-2.4-Postgres-10.Dockerfile b/src/Barman-2.4-Postgres-10.Dockerfile new file mode 100644 index 00000000..e0b2ae9e --- /dev/null +++ b/src/Barman-2.4-Postgres-10.Dockerfile @@ -0,0 +1,71 @@ + +########################################################################## +## AUTO-GENERATED FILE ## +## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ## +########################################################################## + +FROM golang:1.8-jessie + +# grab gosu for easy step-down from root +ARG GOSU_VERSION=1.7 +RUN set -x \ + && apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true + +RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \ + sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \ + apt-get update && \ + apt-get install -y libffi-dev libssl-dev openssh-server + +RUN apt-get install -y postgresql-client-10 + +RUN apt-get install -y barman=2.4\* + +RUN apt-get -y install cron +ADD barman/crontab /etc/cron.d/barman +RUN rm -f /etc/cron.daily/* + +RUN groupadd -r postgres --gid=999 && useradd -r -g postgres -d /home/postgres --uid=999 postgres + +ENV UPSTREAM_NAME pg_cluster +ENV UPSTREAM_CONFIG_FILE /etc/barman.d/upstream.conf +ENV REPLICATION_USER replication_user +ENV REPLICATION_PASSWORD replication_pass +ENV REPLICATION_PORT 5432 +ENV POSTGRES_CONNECTION_TIMEOUT 20 +ENV REPLICATION_SLOT_NAME barman_the_backupper +ENV WAIT_UPSTREAM_TIMEOUT 60 +ENV SSH_ENABLE 0 +ENV NOTVISIBLE "in users profile" +ENV BACKUP_SCHEDULE "0 0 * * *" +ENV BACKUP_RETENTION_DAYS "30" +ENV BACKUP_DIR /var/backups + +# REQUIRED ENV VARS: +# ENV REPLICATION_HOST localhost +# ENV POSTGRES_USER postgres +# ENV POSTGRES_PASSWORD password +# ENV POSTGRES_DB monkey_db + +EXPOSE 22 + +COPY ./ssh /home/postgres/.ssh +RUN chown -R postgres:postgres /home/postgres +COPY ./barman/configs/barman.conf /etc/barman.conf +COPY ./barman/configs/upstream.conf $UPSTREAM_CONFIG_FILE +COPY ./barman/bin /usr/local/bin/barman_docker +RUN chmod +x /usr/local/bin/barman_docker/* && ls /usr/local/bin/barman_docker + +COPY ./barman/metrics /go +RUN cd /go && go build /go/main.go + +VOLUME $BACKUP_DIR + +CMD /usr/local/bin/barman_docker/entrypoint.sh diff --git a/src/Barman-2.4-Postgres-9.6.Dockerfile b/src/Barman-2.4-Postgres-9.6.Dockerfile index e7d3ce63..e306683c 100644 --- a/src/Barman-2.4-Postgres-9.6.Dockerfile +++ b/src/Barman-2.4-Postgres-9.6.Dockerfile @@ -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 ## ########################################################################## FROM golang:1.8-jessie diff --git a/src/Barman-latest.Dockerfile b/src/Barman-latest.Dockerfile index c8e37e87..d2b6b704 120000 --- a/src/Barman-latest.Dockerfile +++ b/src/Barman-latest.Dockerfile @@ -1 +1 @@ -Barman-2.3-Postgres-10.Dockerfile \ No newline at end of file +Barman-2.4-Postgres-10.Dockerfile \ No newline at end of file diff --git a/src/Pgpool-3.3-Postgres-10.Dockerfile b/src/Pgpool-3.3-Postgres-10.Dockerfile index 2ce8acf6..a0bbd1c8 100644 --- a/src/Pgpool-3.3-Postgres-10.Dockerfile +++ b/src/Pgpool-3.3-Postgres-10.Dockerfile @@ -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 ## ########################################################################## FROM debian:jessie diff --git a/src/Pgpool-3.3-Postgres-9.6.Dockerfile b/src/Pgpool-3.3-Postgres-9.6.Dockerfile index 1bf2a352..39319cc1 100644 --- a/src/Pgpool-3.3-Postgres-9.6.Dockerfile +++ b/src/Pgpool-3.3-Postgres-9.6.Dockerfile @@ -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 ## ########################################################################## FROM debian:jessie diff --git a/src/Pgpool-3.6-Postgres-10.Dockerfile b/src/Pgpool-3.6-Postgres-10.Dockerfile index 8a512ae3..a5ee7bf9 100644 --- a/src/Pgpool-3.6-Postgres-10.Dockerfile +++ b/src/Pgpool-3.6-Postgres-10.Dockerfile @@ -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 ## ########################################################################## FROM debian:jessie diff --git a/src/Pgpool-3.6-Postgres-9.6.Dockerfile b/src/Pgpool-3.6-Postgres-9.6.Dockerfile index 1c3cd83b..e157c766 100644 --- a/src/Pgpool-3.6-Postgres-9.6.Dockerfile +++ b/src/Pgpool-3.6-Postgres-9.6.Dockerfile @@ -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 ## ########################################################################## FROM debian:jessie diff --git a/src/Pgpool-3.7-Postgres-10.Dockerfile b/src/Pgpool-3.7-Postgres-10.Dockerfile index 5f8805a6..09bf111c 100644 --- a/src/Pgpool-3.7-Postgres-10.Dockerfile +++ b/src/Pgpool-3.7-Postgres-10.Dockerfile @@ -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 ## ########################################################################## FROM debian:jessie diff --git a/src/Pgpool-3.7-Postgres-9.6.Dockerfile b/src/Pgpool-3.7-Postgres-9.6.Dockerfile index 7199bf08..6236fc98 100644 --- a/src/Pgpool-3.7-Postgres-9.6.Dockerfile +++ b/src/Pgpool-3.7-Postgres-9.6.Dockerfile @@ -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 ## ########################################################################## FROM debian:jessie diff --git a/src/Postgres-10-Repmgr-3.2.Dockerfile b/src/Postgres-10-Repmgr-3.2.Dockerfile index 8780af7c..7dc19941 100644 --- a/src/Postgres-10-Repmgr-3.2.Dockerfile +++ b/src/Postgres-10-Repmgr-3.2.Dockerfile @@ -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 ## ########################################################################## FROM postgres:10 diff --git a/src/Postgres-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-9.5-Repmgr-3.2.Dockerfile index 2cddb4a0..27211afe 100644 --- a/src/Postgres-9.5-Repmgr-3.2.Dockerfile +++ b/src/Postgres-9.5-Repmgr-3.2.Dockerfile @@ -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 ## ########################################################################## FROM postgres:9.5 diff --git a/src/Postgres-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-9.6-Repmgr-3.2.Dockerfile index 58bd11de..545a12fe 100644 --- a/src/Postgres-9.6-Repmgr-3.2.Dockerfile +++ b/src/Postgres-9.6-Repmgr-3.2.Dockerfile @@ -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 ## ########################################################################## FROM postgres:9.6 diff --git a/src/Postgres-extended-10-Repmgr-3.2.Dockerfile b/src/Postgres-extended-10-Repmgr-3.2.Dockerfile index 48c297c5..2c664521 100644 --- a/src/Postgres-extended-10-Repmgr-3.2.Dockerfile +++ b/src/Postgres-extended-10-Repmgr-3.2.Dockerfile @@ -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 ## ########################################################################## FROM postgres:10 diff --git a/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile index 1f0fa71a..501d0ba6 100644 --- a/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile +++ b/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile @@ -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 ## ########################################################################## FROM postgres:9.5 diff --git a/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile index 585b9f76..90fd14ed 100644 --- a/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile +++ b/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile @@ -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 ## ########################################################################## FROM postgres:9.6 diff --git a/src/includes/docker-compose/docker-compose.yml b/src/includes/docker-compose/docker-compose.yml index 00b4c945..baaeffd7 100644 --- a/src/includes/docker-compose/docker-compose.yml +++ b/src/includes/docker-compose/docker-compose.yml @@ -45,6 +45,7 @@ services: - 5422:5432 volumes: - pgmaster:/var/lib/postgresql/data + - ./ssh/:/home/postgres/.ssh/keys networks: cluster: aliases: @@ -58,7 +59,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 @@ -68,6 +69,7 @@ services: - 5441:5432 volumes: - pgslave1:/var/lib/postgresql/data + - ./ssh:/home/postgres/.ssh/keys networks: cluster: aliases: @@ -158,6 +160,7 @@ services: BACKUP_SCHEDULE: "*/30 */5 * * *" volumes: - backup:/var/backups + - ./ssh:/home/postgres/.ssh/keys networks: cluster: aliases: @@ -190,6 +193,8 @@ services: ports: - 5430:5432 - 9898:9898 # PCP + volumes: + - ./ssh:/home/postgres/.ssh/keys networks: cluster: aliases: diff --git a/src/ssh/entrypoint.sh b/src/ssh/entrypoint.sh index bb049920..1d85f34c 100755 --- a/src/ssh/entrypoint.sh +++ b/src/ssh/entrypoint.sh @@ -2,11 +2,17 @@ set -e +cp -f /home/postgres/.ssh/keys/* /home/postgres/.ssh/ || echo 'No pre-populated ssh keys!' chown -R postgres:postgres /home/postgres -chmod 600 -R /home/postgres/.ssh/id_rsa if [[ "$SSH_ENABLE" == "1" ]]; then echo '>>> TUNING UP SSH CLIENT...' + if [ ! -f "/home/postgres/.ssh/id_rsa.pub" ] && [ ! -f "/home/postgres/.ssh/id_rsa" ]; then + echo ">>> There are no ssh keys - SSH daemon can not be enabled!" + exit 1 + fi + + chmod 600 -R /home/postgres/.ssh/id_rsa mkdir -p /var/run/sshd && sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd