eea · sohaib929 · Jun 13, 2024
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,21 +1,68 @@
-version: "2"
+version: '3.5'
 services:
+  web:
+    image: odoo:17.0
+    depends_on:
+      - db
+    #ports:
+    #  - "8069:8069"
+    restart: always
+    volumes:
+      - ./odoo-web-data:/var/lib/odoo
+      #- ./config:/etc/odoo
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - HOST=db
+
+  db:
+    image: 'bitnami/postgresql:13'
+    restart: always
+    #ports:
+    #  - '5432:5432'
+    volumes:
+      - './odoo-db-data-master:/bitnami/postgresql'
+    environment:
+      - POSTGRESQL_REPLICATION_MODE=master
+      - POSTGRESQL_REPLICATION_USER=repl_user
+      - POSTGRESQL_REPLICATION_PASSWORD=repl_password
+      - POSTGRESQL_MAX_CONNECTIONS=1000
+      - POSTGRESQL_STATEMENT_TIMEOUT=60000
+      - POSTGRESQL_SHARED_PRELOAD_LIBRARIES=pg_stat_statements
+      - POSTGRESQL_USERNAME=odoo
+      - POSTGRESQL_PASSWORD=odoo
+      - POSTGRESQL_DATABASE=postgres
+
   haproxy:
-    image: eeacms/haproxy
+    image: self-haproxy:latest
+    restart: always
     depends_on:
-    - webapp
+    - web
     ports:
-    - "80:8080"
-    - "1936:1936"
+    - "9002:5000"
+    - "9003:1936"
     environment:
-      FRONTEND_PORT: "8080"
-      BACKENDS: "webapp"
-      BACKENDS_PORT: "8080"
-      DNS_ENABLED: "True"
-      HTTPCHK: "GET /"
-      INTER: "5s"
+      BACKENDS: "web:8069"
+      DNS_ENABLED: "true"
       LOG_LEVEL: "info"
-  webapp:
-    image: eeacms/hello
-    environment:
-      PORT: "8080"
+      BACKENDS_PORT: 9002
+      STATS_AUTH: admin:YbrS9eP4!j
+      TIMEOUT_SERVER: 180000
+      HTTPCHK: "GET /web/health"
+  #    #LOGGING: :9002
+  #    #VIRTUAL_HOST: 
+  #    #LETSENCRYPT_HOST:
+  #    #VIRTUAL_PORT: 1936
+  #    #BACKEND_NAME: "web"
+  #    #FRONTEND_NAME: "db"
+      #VIRTUAL_HOST: raml.sa
+      #VIRTUAL_PORT: 5000
+      #LETSENCRYPT_HOST: raml.sa
+      #LETSENCRYPT_DNS_MODE: dns-01-challenge
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock
+
+
+networks:
+  default:
+    external:
+      name: ejadnet
diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:1.8.31-buster
+FROM haproxy:2.0.35-buster
 LABEL maintainer="EEA: IDM2 A-Team <[email protected]>"
 
 RUN apt-get update \

diff --git a/haproxy/docker-entrypoint.sh b/haproxy/docker-entrypoint.sh
@@ -57,9 +57,11 @@ if ! test -e /usr/local/etc/haproxy/haproxy.cfg; then
     if [ -n "$LOG_LEVEL" ]; then echo "export LOG_LEVEL=\"$LOG_LEVEL\""  >> /etc/environment; fi
     if [ -n "$PROXY_PROTOCOL_ENABLED" ]; then echo "export PROXY_PROTOCOL_ENABLED=\"$PROXY_PROTOCOL_ENABLED\""  >> /etc/environment; fi
     if [ -n "$RISE" ]; then echo "export RISE=\"$RISE\""  >> /etc/environment; fi
+    if [ -n "$MAXCONN" ]; then echo "export MAXCONN=\"$MAXCONN\""  >> /etc/environment; fi
     if [ -n "$SERVICE_NAMES" ]; then echo "export SERVICE_NAMES=\"$SERVICE_NAMES\""  >> /etc/environment; fi
     if [ -n "$STATS_AUTH" ]; then echo "export STATS_AUTH=\"$STATS_AUTH\""  >> /etc/environment; fi
     if [ -n "$STATS_PORT" ]; then echo "export STATS_PORT=\"$STATS_PORT\""  >> /etc/environment; fi
+    if [ -n "$STATS_REFRESH" ]; then echo "export STATS_REFRESH=\"$STATS_REFRESH\""  >> /etc/environment; fi
     if [ -n "$TIMEOUT_CLIENT" ]; then echo "export TIMEOUT_CLIENT=\"$TIMEOUT_CLIENT\""  >> /etc/environment; fi
     if [ -n "$TIMEOUT_CONNECT" ]; then echo "export TIMEOUT_CONNECT=\"$TIMEOUT_CONNECT\""  >> /etc/environment; fi
     if [ -n "$TIMEOUT_SERVER" ]; then echo "export TIMEOUT_SERVER=\"$TIMEOUT_SERVER\""  >> /etc/environment; fi

diff --git a/haproxy/src/configure.py b/haproxy/src/configure.py
@@ -20,6 +20,7 @@
 PROXY_PROTOCOL_ENABLED = (os.environ.get('PROXY_PROTOCOL_ENABLED', 'false').lower() == "true")
 STATS_PORT = os.environ.get('STATS_PORT', '1936')
 STATS_AUTH = os.environ.get('STATS_AUTH', 'admin:admin')
+STATS_REFRESH = os.environ.get('STATS_REFRESH', '0s')
 BACKENDS = os.environ.get('BACKENDS', '').split(' ')
 BACKENDS_PORT = os.environ.get('BACKENDS_PORT', '80')
 BACKENDS_MODE = os.environ.get('BACKENDS_MODE', FRONTEND_MODE)
@@ -35,6 +36,7 @@
 DOWN_INTER = os.environ.get('DOWN_INTER', INTER)
 RISE = os.environ.get('RISE', '2')
 FALL = os.environ.get('FALL', '3')
+MAXCONN = os.environ.get('MAXCONN', '2')
 
 
 listen_conf = Template("""
@@ -44,6 +46,7 @@
     stats uri /
     stats hide-version
     stats auth $auth
+    stats refresh $refresh
 """)
 
 frontend_conf = Template("""
@@ -62,7 +65,7 @@
   backend $backend
     mode $mode
     balance $balance
-    default-server inter $inter fastinter $fastinter downinter $downinter fall $fall rise $rise
+    default-server inter $inter fastinter $fastinter downinter $downinter fall $fall rise $rise maxconn $maxconn
     cookie $cookies_name insert $cookies_params
 """)
     cookies = "cookie \\\"@@value@@\\\""
@@ -74,7 +77,7 @@
   backend $backend
     mode $mode
     balance $balance
-    default-server inter $inter fastinter $fastinter downinter $downinter fall $fall rise $rise
+    default-server inter $inter fastinter $fastinter downinter $downinter fall $fall rise $rise maxconn $maxconn
     cookie $cookies_name prefix $cookies_params
 """)
     cookies = ""
@@ -87,7 +90,7 @@
 """)
 
 backend_conf_plus = Template("""
-    server $name-$index $host:$port $cookies check
+    server $name-$index $host:$port $cookies check weight $weight
 """)
 
 health_conf = """
@@ -105,7 +108,8 @@
     fall=FALL,
     rise=RISE,
     cookies_name=COOKIES_NAME,
-    cookies_params=COOKIES_PARAMS
+    cookies_params=COOKIES_PARAMS,
+    maxconn=MAXCONN
 )
 
 if BACKENDS_MODE == 'http':
@@ -142,6 +146,7 @@
             index=ip.replace(".", "-"),
             host=ip,
             port=port,
+            weight=1,
             cookies=cookies.replace('@@value@@', ip))
 
 ################################################################################
@@ -153,11 +158,13 @@
         server_port = backend_server.split(':')
         host = server_port[0]
         port = server_port[1] if len(server_port) > 1 else BACKENDS_PORT
+        weight = server_port[2] if len(server_port) > 2 else 1
         backend_conf += backend_conf_plus.substitute(
                 name=host.replace(".", "-"),
                 index=index,
                 host=host,
                 port=port,
+                weight=weight,
                 cookies=cookies.replace('@@value@@', host))
 
 ################################################################################
@@ -208,6 +215,7 @@
                 index=index,
                 host=host_ip,
                 port=host_port,
+                weight=1,
                 cookies=cookies.replace('@@value@@', host_ip)
         )
         index += 1
@@ -235,7 +243,9 @@
 
     configuration.write(
         listen_conf.substitute(
-            port=STATS_PORT, auth=STATS_AUTH
+            port=STATS_PORT,
+            auth=STATS_AUTH,
+            refresh=STATS_REFRESH
         )
     )
 

diff --git a/odoo-db-data-master/data/PG_VERSION b/odoo-db-data-master/data/PG_VERSION
@@ -0,0 +1 @@
+13
diff --git a/odoo-db-data-master/data/base/1/112 b/odoo-db-data-master/data/base/1/112
diff --git a/odoo-db-data-master/data/base/1/113 b/odoo-db-data-master/data/base/1/113
diff --git a/odoo-db-data-master/data/base/1/1247 b/odoo-db-data-master/data/base/1/1247
diff --git a/odoo-db-data-master/data/base/1/1247_fsm b/odoo-db-data-master/data/base/1/1247_fsm
diff --git a/odoo-db-data-master/data/base/1/1247_vm b/odoo-db-data-master/data/base/1/1247_vm
diff --git a/odoo-db-data-master/data/base/1/1249 b/odoo-db-data-master/data/base/1/1249
diff --git a/odoo-db-data-master/data/base/1/1249_fsm b/odoo-db-data-master/data/base/1/1249_fsm
diff --git a/odoo-db-data-master/data/base/1/1249_vm b/odoo-db-data-master/data/base/1/1249_vm
diff --git a/odoo-db-data-master/data/base/1/1255 b/odoo-db-data-master/data/base/1/1255
diff --git a/odoo-db-data-master/data/base/1/1255_fsm b/odoo-db-data-master/data/base/1/1255_fsm
diff --git a/odoo-db-data-master/data/base/1/1255_vm b/odoo-db-data-master/data/base/1/1255_vm
diff --git a/odoo-db-data-master/data/base/1/1259 b/odoo-db-data-master/data/base/1/1259
diff --git a/odoo-db-data-master/data/base/1/1259_fsm b/odoo-db-data-master/data/base/1/1259_fsm
diff --git a/odoo-db-data-master/data/base/1/1259_vm b/odoo-db-data-master/data/base/1/1259_vm
diff --git a/odoo-db-data-master/data/base/1/13318 b/odoo-db-data-master/data/base/1/13318
diff --git a/odoo-db-data-master/data/base/1/13318_fsm b/odoo-db-data-master/data/base/1/13318_fsm
diff --git a/odoo-db-data-master/data/base/1/13318_vm b/odoo-db-data-master/data/base/1/13318_vm
diff --git a/odoo-db-data-master/data/base/1/13320 b/odoo-db-data-master/data/base/1/13320
diff --git a/odoo-db-data-master/data/base/1/13322 b/odoo-db-data-master/data/base/1/13322
diff --git a/odoo-db-data-master/data/base/1/13323 b/odoo-db-data-master/data/base/1/13323
diff --git a/odoo-db-data-master/data/base/1/13323_fsm b/odoo-db-data-master/data/base/1/13323_fsm
diff --git a/odoo-db-data-master/data/base/1/13323_vm b/odoo-db-data-master/data/base/1/13323_vm
diff --git a/odoo-db-data-master/data/base/1/13325 b/odoo-db-data-master/data/base/1/13325
diff --git a/odoo-db-data-master/data/base/1/13327 b/odoo-db-data-master/data/base/1/13327
diff --git a/odoo-db-data-master/data/base/1/13328 b/odoo-db-data-master/data/base/1/13328
diff --git a/odoo-db-data-master/data/base/1/13328_fsm b/odoo-db-data-master/data/base/1/13328_fsm
diff --git a/odoo-db-data-master/data/base/1/13328_vm b/odoo-db-data-master/data/base/1/13328_vm
diff --git a/odoo-db-data-master/data/base/1/13330 b/odoo-db-data-master/data/base/1/13330
diff --git a/odoo-db-data-master/data/base/1/13332 b/odoo-db-data-master/data/base/1/13332
diff --git a/odoo-db-data-master/data/base/1/13333 b/odoo-db-data-master/data/base/1/13333
diff --git a/odoo-db-data-master/data/base/1/13333_fsm b/odoo-db-data-master/data/base/1/13333_fsm
diff --git a/odoo-db-data-master/data/base/1/13333_vm b/odoo-db-data-master/data/base/1/13333_vm
diff --git a/odoo-db-data-master/data/base/1/13335 b/odoo-db-data-master/data/base/1/13335
diff --git a/odoo-db-data-master/data/base/1/13337 b/odoo-db-data-master/data/base/1/13337
diff --git a/odoo-db-data-master/data/base/1/1417 b/odoo-db-data-master/data/base/1/1417
diff --git a/odoo-db-data-master/data/base/1/1418 b/odoo-db-data-master/data/base/1/1418
diff --git a/odoo-db-data-master/data/base/1/174 b/odoo-db-data-master/data/base/1/174
diff --git a/odoo-db-data-master/data/base/1/175 b/odoo-db-data-master/data/base/1/175
diff --git a/odoo-db-data-master/data/base/1/2187 b/odoo-db-data-master/data/base/1/2187
diff --git a/odoo-db-data-master/data/base/1/2224 b/odoo-db-data-master/data/base/1/2224
diff --git a/odoo-db-data-master/data/base/1/2328 b/odoo-db-data-master/data/base/1/2328
diff --git a/odoo-db-data-master/data/base/1/2336 b/odoo-db-data-master/data/base/1/2336
diff --git a/odoo-db-data-master/data/base/1/2337 b/odoo-db-data-master/data/base/1/2337
diff --git a/odoo-db-data-master/data/base/1/2579 b/odoo-db-data-master/data/base/1/2579
diff --git a/odoo-db-data-master/data/base/1/2600 b/odoo-db-data-master/data/base/1/2600
diff --git a/odoo-db-data-master/data/base/1/2600_fsm b/odoo-db-data-master/data/base/1/2600_fsm
diff --git a/odoo-db-data-master/data/base/1/2600_vm b/odoo-db-data-master/data/base/1/2600_vm
diff --git a/odoo-db-data-master/data/base/1/2601 b/odoo-db-data-master/data/base/1/2601
diff --git a/odoo-db-data-master/data/base/1/2601_fsm b/odoo-db-data-master/data/base/1/2601_fsm
diff --git a/odoo-db-data-master/data/base/1/2601_vm b/odoo-db-data-master/data/base/1/2601_vm
diff --git a/odoo-db-data-master/data/base/1/2602 b/odoo-db-data-master/data/base/1/2602
diff --git a/odoo-db-data-master/data/base/1/2602_fsm b/odoo-db-data-master/data/base/1/2602_fsm
diff --git a/odoo-db-data-master/data/base/1/2602_vm b/odoo-db-data-master/data/base/1/2602_vm
diff --git a/odoo-db-data-master/data/base/1/2603 b/odoo-db-data-master/data/base/1/2603
diff --git a/odoo-db-data-master/data/base/1/2603_fsm b/odoo-db-data-master/data/base/1/2603_fsm
diff --git a/odoo-db-data-master/data/base/1/2603_vm b/odoo-db-data-master/data/base/1/2603_vm
diff --git a/odoo-db-data-master/data/base/1/2604 b/odoo-db-data-master/data/base/1/2604
diff --git a/odoo-db-data-master/data/base/1/2605 b/odoo-db-data-master/data/base/1/2605
diff --git a/odoo-db-data-master/data/base/1/2605_fsm b/odoo-db-data-master/data/base/1/2605_fsm
diff --git a/odoo-db-data-master/data/base/1/2605_vm b/odoo-db-data-master/data/base/1/2605_vm
diff --git a/odoo-db-data-master/data/base/1/2606 b/odoo-db-data-master/data/base/1/2606
diff --git a/odoo-db-data-master/data/base/1/2606_fsm b/odoo-db-data-master/data/base/1/2606_fsm
diff --git a/odoo-db-data-master/data/base/1/2606_vm b/odoo-db-data-master/data/base/1/2606_vm
diff --git a/odoo-db-data-master/data/base/1/2607 b/odoo-db-data-master/data/base/1/2607
diff --git a/odoo-db-data-master/data/base/1/2607_fsm b/odoo-db-data-master/data/base/1/2607_fsm
diff --git a/odoo-db-data-master/data/base/1/2607_vm b/odoo-db-data-master/data/base/1/2607_vm
diff --git a/odoo-db-data-master/data/base/1/2608 b/odoo-db-data-master/data/base/1/2608
diff --git a/odoo-db-data-master/data/base/1/2608_fsm b/odoo-db-data-master/data/base/1/2608_fsm
diff --git a/odoo-db-data-master/data/base/1/2608_vm b/odoo-db-data-master/data/base/1/2608_vm
diff --git a/odoo-db-data-master/data/base/1/2609 b/odoo-db-data-master/data/base/1/2609
diff --git a/odoo-db-data-master/data/base/1/2609_fsm b/odoo-db-data-master/data/base/1/2609_fsm
diff --git a/odoo-db-data-master/data/base/1/2609_vm b/odoo-db-data-master/data/base/1/2609_vm
diff --git a/odoo-db-data-master/data/base/1/2610 b/odoo-db-data-master/data/base/1/2610
diff --git a/odoo-db-data-master/data/base/1/2610_fsm b/odoo-db-data-master/data/base/1/2610_fsm
diff --git a/odoo-db-data-master/data/base/1/2610_vm b/odoo-db-data-master/data/base/1/2610_vm
diff --git a/odoo-db-data-master/data/base/1/2611 b/odoo-db-data-master/data/base/1/2611
diff --git a/odoo-db-data-master/data/base/1/2612 b/odoo-db-data-master/data/base/1/2612
diff --git a/odoo-db-data-master/data/base/1/2612_fsm b/odoo-db-data-master/data/base/1/2612_fsm
diff --git a/odoo-db-data-master/data/base/1/2612_vm b/odoo-db-data-master/data/base/1/2612_vm
diff --git a/odoo-db-data-master/data/base/1/2613 b/odoo-db-data-master/data/base/1/2613
diff --git a/odoo-db-data-master/data/base/1/2615 b/odoo-db-data-master/data/base/1/2615
diff --git a/odoo-db-data-master/data/base/1/2615_fsm b/odoo-db-data-master/data/base/1/2615_fsm
diff --git a/odoo-db-data-master/data/base/1/2615_vm b/odoo-db-data-master/data/base/1/2615_vm
diff --git a/odoo-db-data-master/data/base/1/2616 b/odoo-db-data-master/data/base/1/2616
diff --git a/odoo-db-data-master/data/base/1/2616_fsm b/odoo-db-data-master/data/base/1/2616_fsm
diff --git a/odoo-db-data-master/data/base/1/2616_vm b/odoo-db-data-master/data/base/1/2616_vm
diff --git a/odoo-db-data-master/data/base/1/2617 b/odoo-db-data-master/data/base/1/2617
diff --git a/odoo-db-data-master/data/base/1/2617_fsm b/odoo-db-data-master/data/base/1/2617_fsm
diff --git a/odoo-db-data-master/data/base/1/2617_vm b/odoo-db-data-master/data/base/1/2617_vm
diff --git a/odoo-db-data-master/data/base/1/2618 b/odoo-db-data-master/data/base/1/2618
diff --git a/odoo-db-data-master/data/base/1/2618_fsm b/odoo-db-data-master/data/base/1/2618_fsm
diff --git a/odoo-db-data-master/data/base/1/2618_vm b/odoo-db-data-master/data/base/1/2618_vm
diff --git a/odoo-db-data-master/data/base/1/2619 b/odoo-db-data-master/data/base/1/2619
diff --git a/odoo-db-data-master/data/base/1/2619_fsm b/odoo-db-data-master/data/base/1/2619_fsm
diff --git a/odoo-db-data-master/data/base/1/2619_vm b/odoo-db-data-master/data/base/1/2619_vm
diff --git a/odoo-db-data-master/data/base/1/2620 b/odoo-db-data-master/data/base/1/2620
diff --git a/odoo-db-data-master/data/base/1/2650 b/odoo-db-data-master/data/base/1/2650
diff --git a/odoo-db-data-master/data/base/1/2651 b/odoo-db-data-master/data/base/1/2651
diff --git a/odoo-db-data-master/data/base/1/2652 b/odoo-db-data-master/data/base/1/2652
diff --git a/odoo-db-data-master/data/base/1/2653 b/odoo-db-data-master/data/base/1/2653
diff --git a/odoo-db-data-master/data/base/1/2654 b/odoo-db-data-master/data/base/1/2654
diff --git a/odoo-db-data-master/data/base/1/2655 b/odoo-db-data-master/data/base/1/2655
diff --git a/odoo-db-data-master/data/base/1/2656 b/odoo-db-data-master/data/base/1/2656
diff --git a/odoo-db-data-master/data/base/1/2657 b/odoo-db-data-master/data/base/1/2657
diff --git a/odoo-db-data-master/data/base/1/2658 b/odoo-db-data-master/data/base/1/2658
diff --git a/odoo-db-data-master/data/base/1/2659 b/odoo-db-data-master/data/base/1/2659
diff --git a/odoo-db-data-master/data/base/1/2660 b/odoo-db-data-master/data/base/1/2660
diff --git a/odoo-db-data-master/data/base/1/2661 b/odoo-db-data-master/data/base/1/2661
diff --git a/odoo-db-data-master/data/base/1/2662 b/odoo-db-data-master/data/base/1/2662
diff --git a/odoo-db-data-master/data/base/1/2663 b/odoo-db-data-master/data/base/1/2663
diff --git a/odoo-db-data-master/data/base/1/2664 b/odoo-db-data-master/data/base/1/2664
diff --git a/odoo-db-data-master/data/base/1/2665 b/odoo-db-data-master/data/base/1/2665
diff --git a/odoo-db-data-master/data/base/1/2666 b/odoo-db-data-master/data/base/1/2666
diff --git a/odoo-db-data-master/data/base/1/2667 b/odoo-db-data-master/data/base/1/2667
diff --git a/odoo-db-data-master/data/base/1/2668 b/odoo-db-data-master/data/base/1/2668
diff --git a/odoo-db-data-master/data/base/1/2669 b/odoo-db-data-master/data/base/1/2669
diff --git a/odoo-db-data-master/data/base/1/2670 b/odoo-db-data-master/data/base/1/2670
diff --git a/odoo-db-data-master/data/base/1/2673 b/odoo-db-data-master/data/base/1/2673
diff --git a/odoo-db-data-master/data/base/1/2674 b/odoo-db-data-master/data/base/1/2674
diff --git a/odoo-db-data-master/data/base/1/2675 b/odoo-db-data-master/data/base/1/2675
diff --git a/odoo-db-data-master/data/base/1/2678 b/odoo-db-data-master/data/base/1/2678
diff --git a/odoo-db-data-master/data/base/1/2679 b/odoo-db-data-master/data/base/1/2679
diff --git a/odoo-db-data-master/data/base/1/2680 b/odoo-db-data-master/data/base/1/2680
diff --git a/odoo-db-data-master/data/base/1/2681 b/odoo-db-data-master/data/base/1/2681
diff --git a/odoo-db-data-master/data/base/1/2682 b/odoo-db-data-master/data/base/1/2682
diff --git a/odoo-db-data-master/data/base/1/2683 b/odoo-db-data-master/data/base/1/2683
diff --git a/odoo-db-data-master/data/base/1/2684 b/odoo-db-data-master/data/base/1/2684
diff --git a/odoo-db-data-master/data/base/1/2685 b/odoo-db-data-master/data/base/1/2685
diff --git a/odoo-db-data-master/data/base/1/2686 b/odoo-db-data-master/data/base/1/2686
diff --git a/odoo-db-data-master/data/base/1/2687 b/odoo-db-data-master/data/base/1/2687
diff --git a/odoo-db-data-master/data/base/1/2688 b/odoo-db-data-master/data/base/1/2688
diff --git a/odoo-db-data-master/data/base/1/2689 b/odoo-db-data-master/data/base/1/2689
diff --git a/odoo-db-data-master/data/base/1/2690 b/odoo-db-data-master/data/base/1/2690
diff --git a/odoo-db-data-master/data/base/1/2691 b/odoo-db-data-master/data/base/1/2691
diff --git a/odoo-db-data-master/data/base/1/2692 b/odoo-db-data-master/data/base/1/2692
diff --git a/odoo-db-data-master/data/base/1/2693 b/odoo-db-data-master/data/base/1/2693
diff --git a/odoo-db-data-master/data/base/1/2696 b/odoo-db-data-master/data/base/1/2696
diff --git a/odoo-db-data-master/data/base/1/2699 b/odoo-db-data-master/data/base/1/2699
diff --git a/odoo-db-data-master/data/base/1/2701 b/odoo-db-data-master/data/base/1/2701
diff --git a/odoo-db-data-master/data/base/1/2702 b/odoo-db-data-master/data/base/1/2702
diff --git a/odoo-db-data-master/data/base/1/2703 b/odoo-db-data-master/data/base/1/2703
diff --git a/odoo-db-data-master/data/base/1/2704 b/odoo-db-data-master/data/base/1/2704
diff --git a/odoo-db-data-master/data/base/1/2753 b/odoo-db-data-master/data/base/1/2753
diff --git a/odoo-db-data-master/data/base/1/2753_fsm b/odoo-db-data-master/data/base/1/2753_fsm
diff --git a/odoo-db-data-master/data/base/1/2753_vm b/odoo-db-data-master/data/base/1/2753_vm
diff --git a/odoo-db-data-master/data/base/1/2754 b/odoo-db-data-master/data/base/1/2754
diff --git a/odoo-db-data-master/data/base/1/2755 b/odoo-db-data-master/data/base/1/2755
diff --git a/odoo-db-data-master/data/base/1/2756 b/odoo-db-data-master/data/base/1/2756
diff --git a/odoo-db-data-master/data/base/1/2757 b/odoo-db-data-master/data/base/1/2757
diff --git a/odoo-db-data-master/data/base/1/2830 b/odoo-db-data-master/data/base/1/2830
diff --git a/odoo-db-data-master/data/base/1/2831 b/odoo-db-data-master/data/base/1/2831
diff --git a/odoo-db-data-master/data/base/1/2832 b/odoo-db-data-master/data/base/1/2832
diff --git a/odoo-db-data-master/data/base/1/2833 b/odoo-db-data-master/data/base/1/2833
diff --git a/odoo-db-data-master/data/base/1/2834 b/odoo-db-data-master/data/base/1/2834
diff --git a/odoo-db-data-master/data/base/1/2835 b/odoo-db-data-master/data/base/1/2835
diff --git a/odoo-db-data-master/data/base/1/2836 b/odoo-db-data-master/data/base/1/2836
diff --git a/odoo-db-data-master/data/base/1/2837 b/odoo-db-data-master/data/base/1/2837
diff --git a/odoo-db-data-master/data/base/1/2838 b/odoo-db-data-master/data/base/1/2838
diff --git a/odoo-db-data-master/data/base/1/2838_fsm b/odoo-db-data-master/data/base/1/2838_fsm
diff --git a/odoo-db-data-master/data/base/1/2838_vm b/odoo-db-data-master/data/base/1/2838_vm
diff --git a/odoo-db-data-master/data/base/1/2839 b/odoo-db-data-master/data/base/1/2839
diff --git a/odoo-db-data-master/data/base/1/2840 b/odoo-db-data-master/data/base/1/2840
diff --git a/odoo-db-data-master/data/base/1/2840_fsm b/odoo-db-data-master/data/base/1/2840_fsm
diff --git a/odoo-db-data-master/data/base/1/2840_vm b/odoo-db-data-master/data/base/1/2840_vm
diff --git a/odoo-db-data-master/data/base/1/2841 b/odoo-db-data-master/data/base/1/2841
diff --git a/odoo-db-data-master/data/base/1/2995 b/odoo-db-data-master/data/base/1/2995
diff --git a/odoo-db-data-master/data/base/1/2996 b/odoo-db-data-master/data/base/1/2996
diff --git a/odoo-db-data-master/data/base/1/3079 b/odoo-db-data-master/data/base/1/3079
diff --git a/odoo-db-data-master/data/base/1/3079_fsm b/odoo-db-data-master/data/base/1/3079_fsm
diff --git a/odoo-db-data-master/data/base/1/3079_vm b/odoo-db-data-master/data/base/1/3079_vm
diff --git a/odoo-db-data-master/data/base/1/3080 b/odoo-db-data-master/data/base/1/3080
diff --git a/odoo-db-data-master/data/base/1/3081 b/odoo-db-data-master/data/base/1/3081
diff --git a/odoo-db-data-master/data/base/1/3085 b/odoo-db-data-master/data/base/1/3085
diff --git a/odoo-db-data-master/data/base/1/3118 b/odoo-db-data-master/data/base/1/3118
diff --git a/odoo-db-data-master/data/base/1/3119 b/odoo-db-data-master/data/base/1/3119
diff --git a/odoo-db-data-master/data/base/1/3164 b/odoo-db-data-master/data/base/1/3164
diff --git a/odoo-db-data-master/data/base/1/3256 b/odoo-db-data-master/data/base/1/3256
diff --git a/odoo-db-data-master/data/base/1/3257 b/odoo-db-data-master/data/base/1/3257
diff --git a/odoo-db-data-master/data/base/1/3258 b/odoo-db-data-master/data/base/1/3258
diff --git a/odoo-db-data-master/data/base/1/3350 b/odoo-db-data-master/data/base/1/3350
diff --git a/odoo-db-data-master/data/base/1/3351 b/odoo-db-data-master/data/base/1/3351
diff --git a/odoo-db-data-master/data/base/1/3379 b/odoo-db-data-master/data/base/1/3379
diff --git a/odoo-db-data-master/data/base/1/3380 b/odoo-db-data-master/data/base/1/3380
diff --git a/odoo-db-data-master/data/base/1/3381 b/odoo-db-data-master/data/base/1/3381
diff --git a/odoo-db-data-master/data/base/1/3394 b/odoo-db-data-master/data/base/1/3394
diff --git a/odoo-db-data-master/data/base/1/3394_fsm b/odoo-db-data-master/data/base/1/3394_fsm
diff --git a/odoo-db-data-master/data/base/1/3394_vm b/odoo-db-data-master/data/base/1/3394_vm
diff --git a/odoo-db-data-master/data/base/1/3395 b/odoo-db-data-master/data/base/1/3395
diff --git a/odoo-db-data-master/data/base/1/3429 b/odoo-db-data-master/data/base/1/3429
diff --git a/odoo-db-data-master/data/base/1/3430 b/odoo-db-data-master/data/base/1/3430
diff --git a/odoo-db-data-master/data/base/1/3431 b/odoo-db-data-master/data/base/1/3431
diff --git a/odoo-db-data-master/data/base/1/3433 b/odoo-db-data-master/data/base/1/3433
diff --git a/odoo-db-data-master/data/base/1/3439 b/odoo-db-data-master/data/base/1/3439
diff --git a/odoo-db-data-master/data/base/1/3440 b/odoo-db-data-master/data/base/1/3440
diff --git a/odoo-db-data-master/data/base/1/3455 b/odoo-db-data-master/data/base/1/3455
diff --git a/odoo-db-data-master/data/base/1/3456 b/odoo-db-data-master/data/base/1/3456
diff --git a/odoo-db-data-master/data/base/1/3456_fsm b/odoo-db-data-master/data/base/1/3456_fsm
diff --git a/odoo-db-data-master/data/base/1/3456_vm b/odoo-db-data-master/data/base/1/3456_vm
diff --git a/odoo-db-data-master/data/base/1/3466 b/odoo-db-data-master/data/base/1/3466
diff --git a/odoo-db-data-master/data/base/1/3467 b/odoo-db-data-master/data/base/1/3467
diff --git a/odoo-db-data-master/data/base/1/3468 b/odoo-db-data-master/data/base/1/3468
diff --git a/odoo-db-data-master/data/base/1/3501 b/odoo-db-data-master/data/base/1/3501
diff --git a/odoo-db-data-master/data/base/1/3502 b/odoo-db-data-master/data/base/1/3502
diff --git a/odoo-db-data-master/data/base/1/3503 b/odoo-db-data-master/data/base/1/3503
diff --git a/odoo-db-data-master/data/base/1/3534 b/odoo-db-data-master/data/base/1/3534
diff --git a/odoo-db-data-master/data/base/1/3541 b/odoo-db-data-master/data/base/1/3541
diff --git a/odoo-db-data-master/data/base/1/3541_fsm b/odoo-db-data-master/data/base/1/3541_fsm
diff --git a/odoo-db-data-master/data/base/1/3541_vm b/odoo-db-data-master/data/base/1/3541_vm
diff --git a/odoo-db-data-master/data/base/1/3542 b/odoo-db-data-master/data/base/1/3542
diff --git a/odoo-db-data-master/data/base/1/3574 b/odoo-db-data-master/data/base/1/3574
diff --git a/odoo-db-data-master/data/base/1/3575 b/odoo-db-data-master/data/base/1/3575
diff --git a/odoo-db-data-master/data/base/1/3576 b/odoo-db-data-master/data/base/1/3576
diff --git a/odoo-db-data-master/data/base/1/3596 b/odoo-db-data-master/data/base/1/3596
diff --git a/odoo-db-data-master/data/base/1/3597 b/odoo-db-data-master/data/base/1/3597
diff --git a/odoo-db-data-master/data/base/1/3598 b/odoo-db-data-master/data/base/1/3598
diff --git a/odoo-db-data-master/data/base/1/3599 b/odoo-db-data-master/data/base/1/3599
diff --git a/odoo-db-data-master/data/base/1/3600 b/odoo-db-data-master/data/base/1/3600
diff --git a/odoo-db-data-master/data/base/1/3600_fsm b/odoo-db-data-master/data/base/1/3600_fsm
diff --git a/odoo-db-data-master/data/base/1/3600_vm b/odoo-db-data-master/data/base/1/3600_vm
diff --git a/odoo-db-data-master/data/base/1/3601 b/odoo-db-data-master/data/base/1/3601
diff --git a/odoo-db-data-master/data/base/1/3601_fsm b/odoo-db-data-master/data/base/1/3601_fsm
diff --git a/odoo-db-data-master/data/base/1/3601_vm b/odoo-db-data-master/data/base/1/3601_vm
diff --git a/odoo-db-data-master/data/base/1/3602 b/odoo-db-data-master/data/base/1/3602
diff --git a/odoo-db-data-master/data/base/1/3602_fsm b/odoo-db-data-master/data/base/1/3602_fsm
diff --git a/odoo-db-data-master/data/base/1/3602_vm b/odoo-db-data-master/data/base/1/3602_vm
diff --git a/odoo-db-data-master/data/base/1/3603 b/odoo-db-data-master/data/base/1/3603
diff --git a/odoo-db-data-master/data/base/1/3603_fsm b/odoo-db-data-master/data/base/1/3603_fsm
diff --git a/odoo-db-data-master/data/base/1/3603_vm b/odoo-db-data-master/data/base/1/3603_vm
diff --git a/odoo-db-data-master/data/base/1/3604 b/odoo-db-data-master/data/base/1/3604
diff --git a/odoo-db-data-master/data/base/1/3605 b/odoo-db-data-master/data/base/1/3605
diff --git a/odoo-db-data-master/data/base/1/3606 b/odoo-db-data-master/data/base/1/3606
diff --git a/odoo-db-data-master/data/base/1/3607 b/odoo-db-data-master/data/base/1/3607
diff --git a/odoo-db-data-master/data/base/1/3608 b/odoo-db-data-master/data/base/1/3608
diff --git a/odoo-db-data-master/data/base/1/3609 b/odoo-db-data-master/data/base/1/3609
diff --git a/odoo-db-data-master/data/base/1/3712 b/odoo-db-data-master/data/base/1/3712
diff --git a/odoo-db-data-master/data/base/1/3764 b/odoo-db-data-master/data/base/1/3764
diff --git a/odoo-db-data-master/data/base/1/3764_fsm b/odoo-db-data-master/data/base/1/3764_fsm
diff --git a/odoo-db-data-master/data/base/1/3764_vm b/odoo-db-data-master/data/base/1/3764_vm
diff --git a/odoo-db-data-master/data/base/1/3766 b/odoo-db-data-master/data/base/1/3766
diff --git a/odoo-db-data-master/data/base/1/3767 b/odoo-db-data-master/data/base/1/3767
diff --git a/odoo-db-data-master/data/base/1/3997 b/odoo-db-data-master/data/base/1/3997
diff --git a/odoo-db-data-master/data/base/1/4143 b/odoo-db-data-master/data/base/1/4143
diff --git a/odoo-db-data-master/data/base/1/4144 b/odoo-db-data-master/data/base/1/4144
diff --git a/odoo-db-data-master/data/base/1/4145 b/odoo-db-data-master/data/base/1/4145
diff --git a/odoo-db-data-master/data/base/1/4146 b/odoo-db-data-master/data/base/1/4146
diff --git a/odoo-db-data-master/data/base/1/4147 b/odoo-db-data-master/data/base/1/4147
diff --git a/odoo-db-data-master/data/base/1/4148 b/odoo-db-data-master/data/base/1/4148
diff --git a/odoo-db-data-master/data/base/1/4149 b/odoo-db-data-master/data/base/1/4149
diff --git a/odoo-db-data-master/data/base/1/4150 b/odoo-db-data-master/data/base/1/4150
diff --git a/odoo-db-data-master/data/base/1/4151 b/odoo-db-data-master/data/base/1/4151
diff --git a/odoo-db-data-master/data/base/1/4152 b/odoo-db-data-master/data/base/1/4152
diff --git a/odoo-db-data-master/data/base/1/4153 b/odoo-db-data-master/data/base/1/4153
diff --git a/odoo-db-data-master/data/base/1/4154 b/odoo-db-data-master/data/base/1/4154
diff --git a/odoo-db-data-master/data/base/1/4155 b/odoo-db-data-master/data/base/1/4155
diff --git a/odoo-db-data-master/data/base/1/4156 b/odoo-db-data-master/data/base/1/4156
diff --git a/odoo-db-data-master/data/base/1/4157 b/odoo-db-data-master/data/base/1/4157
diff --git a/odoo-db-data-master/data/base/1/4158 b/odoo-db-data-master/data/base/1/4158
diff --git a/odoo-db-data-master/data/base/1/4159 b/odoo-db-data-master/data/base/1/4159
diff --git a/odoo-db-data-master/data/base/1/4160 b/odoo-db-data-master/data/base/1/4160
diff --git a/odoo-db-data-master/data/base/1/4161 b/odoo-db-data-master/data/base/1/4161
diff --git a/odoo-db-data-master/data/base/1/4162 b/odoo-db-data-master/data/base/1/4162
diff --git a/odoo-db-data-master/data/base/1/4163 b/odoo-db-data-master/data/base/1/4163
diff --git a/odoo-db-data-master/data/base/1/4164 b/odoo-db-data-master/data/base/1/4164
diff --git a/odoo-db-data-master/data/base/1/4165 b/odoo-db-data-master/data/base/1/4165
diff --git a/odoo-db-data-master/data/base/1/4166 b/odoo-db-data-master/data/base/1/4166
diff --git a/odoo-db-data-master/data/base/1/4167 b/odoo-db-data-master/data/base/1/4167
diff --git a/odoo-db-data-master/data/base/1/4168 b/odoo-db-data-master/data/base/1/4168
diff --git a/odoo-db-data-master/data/base/1/4169 b/odoo-db-data-master/data/base/1/4169
diff --git a/odoo-db-data-master/data/base/1/4170 b/odoo-db-data-master/data/base/1/4170
diff --git a/odoo-db-data-master/data/base/1/4171 b/odoo-db-data-master/data/base/1/4171
diff --git a/odoo-db-data-master/data/base/1/4172 b/odoo-db-data-master/data/base/1/4172
diff --git a/odoo-db-data-master/data/base/1/4173 b/odoo-db-data-master/data/base/1/4173
diff --git a/odoo-db-data-master/data/base/1/4174 b/odoo-db-data-master/data/base/1/4174
diff --git a/odoo-db-data-master/data/base/1/5002 b/odoo-db-data-master/data/base/1/5002
diff --git a/odoo-db-data-master/data/base/1/548 b/odoo-db-data-master/data/base/1/548
diff --git a/odoo-db-data-master/data/base/1/549 b/odoo-db-data-master/data/base/1/549
diff --git a/odoo-db-data-master/data/base/1/6102 b/odoo-db-data-master/data/base/1/6102
diff --git a/odoo-db-data-master/data/base/1/6104 b/odoo-db-data-master/data/base/1/6104
diff --git a/odoo-db-data-master/data/base/1/6106 b/odoo-db-data-master/data/base/1/6106
diff --git a/odoo-db-data-master/data/base/1/6110 b/odoo-db-data-master/data/base/1/6110
diff --git a/odoo-db-data-master/data/base/1/6111 b/odoo-db-data-master/data/base/1/6111
diff --git a/odoo-db-data-master/data/base/1/6112 b/odoo-db-data-master/data/base/1/6112
diff --git a/odoo-db-data-master/data/base/1/6113 b/odoo-db-data-master/data/base/1/6113
diff --git a/odoo-db-data-master/data/base/1/6117 b/odoo-db-data-master/data/base/1/6117
diff --git a/odoo-db-data-master/data/base/1/826 b/odoo-db-data-master/data/base/1/826
diff --git a/odoo-db-data-master/data/base/1/827 b/odoo-db-data-master/data/base/1/827
diff --git a/odoo-db-data-master/data/base/1/828 b/odoo-db-data-master/data/base/1/828
diff --git a/odoo-db-data-master/data/base/1/PG_VERSION b/odoo-db-data-master/data/base/1/PG_VERSION
@@ -0,0 +1 @@
+13
diff --git a/odoo-db-data-master/data/base/1/pg_filenode.map b/odoo-db-data-master/data/base/1/pg_filenode.map
diff --git a/odoo-db-data-master/data/base/13467/112 b/odoo-db-data-master/data/base/13467/112
diff --git a/odoo-db-data-master/data/base/13467/113 b/odoo-db-data-master/data/base/13467/113
diff --git a/odoo-db-data-master/data/base/13467/1247 b/odoo-db-data-master/data/base/13467/1247
diff --git a/odoo-db-data-master/data/base/13467/1247_fsm b/odoo-db-data-master/data/base/13467/1247_fsm
diff --git a/odoo-db-data-master/data/base/13467/1247_vm b/odoo-db-data-master/data/base/13467/1247_vm
diff --git a/odoo-db-data-master/data/base/13467/1249 b/odoo-db-data-master/data/base/13467/1249