Merge pull request #48 from cybertec-postgresql/47-update-yaml-templates-to-the-latest-versions

[*]  update `.yaml` templates to the latest versions, closes #47

Author: pashagolub

make.bat

@@ -74,6 +74,8 @@ if exist %SEVENZIP% (
 )
 TIMEOUT 5
 MOVE vip-manager* %MD%\vip-manager || EXIT /B
+DEL %MD%\vip-manager\*.yml || EXIT /B
+COPY src\vip.yaml %MD%\vip-manager\ || EXIT /B
 DEL %TEMP%\vip.zip || EXIT /B
 @ECHO --- VIP-MANAGER downloaded ---
 
@@ -145,12 +147,10 @@ CALL make-installer.bat || EXIT /B
 
 @ECHO --- Prepare archive ---
 if exist %SEVENZIP% (
-    %SEVENZIP% a "%MD%.zip" -y "%MD%" -sdel
+    %SEVENZIP% a "%MD%.zip" -y "%MD%"
 ) else (
     powershell -Command "Compress-Archive '%MD%' '%MD%.zip'"
 )
 @ECHO --- Archive compressed ---
 
-
-
-@ECHO --- PACKAGING FINISHED ---
+@ECHO --- PACKAGING FINISHED ---

src/etcd.yaml

@@ -1,5 +1,12 @@
+name: 'win1'
+data-dir: win1.etcd
 heartbeat-interval: 100
 election-timeout: 1000
 listen-peer-urls: http://0.0.0.0:2380
 listen-client-urls: http://0.0.0.0:2379
+initial-advertise-peer-urls: http://192.168.178.88:2380
+advertise-client-urls: http://192.168.178.88:2379
+initial-cluster: win1=http://192.168.178.88:2380,win2=http://192.168.178.89:2380,win3=http://192.168.178.90:2380
+initial-cluster-token: 'etcd-cluster'
+initial-cluster-state: 'new'
 enable-v2: true

src/patroni.yaml

@@ -1,96 +1,51 @@
-scope: batman
-#namespace: /service/
-name: postgresql0
+scope: pgcluster
+namespace: /service/
+name: win1
 
 restapi:
-  listen: 127.0.0.1:8008
-  connect_address: 127.0.0.1:8008
-#  certfile: /etc/ssl/certs/ssl-cert-snakeoil.pem
-#  keyfile: /etc/ssl/private/ssl-cert-snakeoil.key
-#  authentication:
-#    username: username
-#    password: password
-
-# ctl:
-#   insecure: false # Allow connections to SSL sites without certs
-#   certfile: /etc/ssl/certs/ssl-cert-snakeoil.pem
-#   cacert: /etc/ssl/certs/ssl-cacert-snakeoil.pem
+  listen: 0.0.0.0:8008
+  connect_address: 192.168.178.88:8008
 
 etcd:
-  host: 127.0.0.1:2379
+  hosts:
+  - 192.168.178.88:2379
+  - 192.168.178.89:2379
+  - 192.168.178.90:2379
 
 bootstrap:
-  # this section will be written into Etcd:/<namespace>/<scope>/config after initializing new cluster
-  # and all other cluster members will use it as a `global configuration`
   dcs:
     ttl: 30
     loop_wait: 10
     retry_timeout: 10
-    maximum_lag_on_failover: 1048576
-#    master_start_timeout: 300
-#    synchronous_mode: false
-    #standby_cluster:
-      #host: 127.0.0.1
-      #port: 1111
-      #primary_slot_name: patroni
+    maximum_lag_on_failover: 1048906
     postgresql:
       use_pg_rewind: true
-#      use_slots: true
+      use_slots: true
       parameters:
-#        wal_level: hot_standby
-#        hot_standby: "on"
-#        wal_keep_segments: 8
-#        max_wal_senders: 10
-#        max_replication_slots: 10
-#        wal_log_hints: "on"
-#        archive_mode: "on"
-#        archive_timeout: 1800s
-#        archive_command: mkdir -p ../wal_archive && test ! -f ../wal_archive/%f && cp %p ../wal_archive/%f
-#      recovery_conf:
-#        restore_command: cp ../wal_archive/%f %p
-
-  # some desired options for 'initdb'
-  initdb:  # Note: It needs to be a list (some options need values, others are switches)
+        logging_collector: true
+        log_directory: log
+        log_filename: postgresql.log
+        wal_keep_segments: 50
+      pg_hba:
+      - host replication replicator 0.0.0.0/0 md5
+      - host all all 0.0.0.0/0 md5
+
+  initdb: 
   - encoding: UTF8
   - data-checksums
 
-  pg_hba:  # Add following lines to pg_hba.conf after running 'initdb'
-  - host replication replicator 127.0.0.1/32 md5
-  - host all all 0.0.0.0/0 md5
-#  - hostssl all all 0.0.0.0/0 md5
-
-  # Additional script to be launched after initial cluster creation (will be passed the connection URL as parameter)
-# post_init: /usr/local/bin/setup_cluster.sh
-
-  # Some additional users users which needs to be created after initializing new cluster
-  users:
-    admin:
-      password: admin
-      options:
-        - createrole
-        - createdb
-
 postgresql:
-  listen: 127.0.0.1:5432
-  connect_address: 127.0.0.1:5432
-  data_dir: data/postgresql0
-#  bin_dir: C:/bigsql/pg11/bin
-#  config_dir:
-  pgpass: data/pgpass0
+  listen: 0.0.0.0:5432
+  connect_address: 192.168.178.88:5432
+  data_dir: ../pgsql/data
+  bin_dir: ../pgsql/bin
   authentication:
     replication:
       username: replicator
-      password: rep-pass
+      password: reptilefluid
     superuser:
       username: postgres
-      password: zalando
-  parameters:
-    unix_socket_directories: '.'
-
-#watchdog:
-#  mode: automatic # Allowed values: off, automatic, required
-#  device: /dev/watchdog
-#  safety_margin: 5
+      password: snakeoil
 
 tags:
     nofailover: false

src/vip.yaml

@@ -0,0 +1,22 @@
+# time (in milliseconds) after which vip-manager wakes up and checks if it needs to register or release ip addresses.
+interval: 1000
+
+# the etcd or consul key which vip-manager will regularly poll.
+key: "/service/pgcluster/leader"
+# if the value of the above key matches the trigger-value (often the hostname of this host), vip-manager will try to add the virtual ip address to the interface specified in Iface
+nodename: "win2"
+
+ip: 192.168.178.123 # the virtual ip address to manage
+mask: 24 # netmask for the virtual ip
+iface: "Ethernet 2" #interface to which the virtual ip will be added
+
+endpoint_type: etcd # etcd or consul
+# a list that contains all DCS endpoints to which vip-manager could talk. 
+endpoints:
+  - http://192.168.178.96:2379
+  - http://192.168.178.97:2379
+  - http://192.168.178.98:2379
+
+# how often things should be retried and how long to wait between retries. (currently only affects arpClient)
+retry_num: 2
+retry_after: 250  #in milliseconds

src/vip_service.xml

@@ -3,6 +3,6 @@
   <name>vip-manager</name>
   <description>Manager for a virtual IP based on state kept in etcd or Consul </description>
   <executable>%BASE%\vip-manager.exe</executable>
-  <arguments>--config %BASE%\vip-manager.yaml</arguments>
+  <arguments>--config %BASE%\vip.yaml</arguments>
   <logpath>%BASE%\log</logpath>
 </service>