split postgres and redis data store, cleaned up readme, add log level…

… env variable
UchuServer · Oct 13, 2020 · 0ae30d5 · 0ae30d5
1 parent 0de6006
commit 0ae30d5
Show file tree

Hide file tree

Showing 1,366 changed files with 925 additions and 22 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,15 +1,19 @@
 # Only this variable has to be changed
-GAME_FOLDER=/res
-DATA_FOLDER=./data
+GAME_FOLDER=/path/to/LU/res
+
+# Optional Uchu Docker configuration, can be left unchanged
+REDIS_DATA_FOLDER=./redis-data
+POSTGRES_DATA_FOLDER=./pg-data
 CERTIFICATE=./cert.pfx
 HOSTNAME=localhost
+LOG_LEVEL=Information
 
-# Postgres specific setup, no modifications needed by default
+# Postgres specific setup, can be left unchanged
 POSTGRES_USER=uchu
 POSTGRES_PASSWORD=uchu
 POSTGRES_DB=uchu
 
-# Exposed Uchu specific setup, no modifications needed by default
+# Docker networking setup, can be left unchanged
 DATABASE_PORT=5432
 REDIS_PORT=6379
 ADMINER_PORT=8080

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ Docker setup for running the Uchu Lego Universe server
 - Docker
 - Docker Compose (a version that supports at least docker-compose v3.3 files)
 - [LU unpacked client](https://docs.google.com/document/d/1XmHXWuUQqzUIOcv6SVVjaNBm4bFg9lnW4Pk1pllimEg/edit) with [LCDRs TcpUdp mod](https://github.com/lcdr/raknet_shim_dll/releases/tag/2020-09-03)
+- Bash or PowerShell
 
 ## Setup
 
@@ -15,10 +16,6 @@ Docker setup for running the Uchu Lego Universe server
 Clone the repository recursively, so that the Uchu source is also pulled:
 
 ```bash
-# If you prefer to use HTTPS (default)
-git clone https://github.com/MickVermeulen/UchuDocker.git --recursive -b master
-
-# If you prefer to use SSH
 git clone [email protected]:MickVermeulen/UchuDocker.git --recursive -b master
 ```
 
@@ -27,11 +24,8 @@ git clone [email protected]:MickVermeulen/UchuDocker.git --recursive -b master
 Copy the `.env.sample` file to `.env`:
 
 ```bash
-# On Linux, MacOS and Powershell
+# Use Bash or Powershell
 cp .env.sample .env
-
-# On Windows CMD
-copy .env.sample .env
 ```
 
 Set the `GAME_FOLDER` variable in the `.env` file to the absolute path to the `/res` folder in your unpacked `LU` game folder using a text editor of your choice.
@@ -41,14 +35,14 @@ Set the `GAME_FOLDER` variable in the `.env` file to the absolute path to the `/
 Create a data folder which will store your database files to ensure no loss of data:
 
 ```bash
-mkdir data
+mkdir pg-data
+mkdir redis-data
 ```
 
-This can also be done by creating a new folder named `data` manually, without the terminal.
-
 ## Running
 
 ```bash
+docker-compose build
 docker-compose up -d
 ```
 
@@ -58,7 +52,7 @@ This runs Uchu in the background along with Postgres and Redis. You can attach t
 docker attach uchudocker_uchu_1
 ```
 
-This allows you to input shell commands like `/adduser <username>`. You can exit the shell using `Ctrl+P + Ctrl+Q` (`Ctrl+C` closes the container, not just your attach session).
+This allows you to input shell commands like `/adduser <username>`. You can exit the shell using `Ctrl+P + Ctrl+Q` (`Ctrl+C` closes the container, not just your session).
 
 ## Closing
 
@@ -68,12 +62,14 @@ docker-compose down
 
 ## Applying changes to .env
 
-When applying any changes to the `.env` file after your initial `docker-compose up -d`, the changes aren't built into the container. First run `docker-compose build --no-cache` to apply your `.env` file changes after which `docker-compose up -d` can be used again to start up Uchu. Note that this is not required if you only changed the LU resource location before running your first `docker-compose up -d`, but is required for any subsequent changes.
+When applying any changes to the `.env` file after your initial `docker-compose up -d`, the changes aren't built into the container. Run `docker-compose build --no-cache` to apply your `.env` file changes after which `docker-compose up -d` can be to start up Uchu.
 
 ## Adminer
 
 Uchu Docker can also run [Adminer](https://www.adminer.org), which allows you to easily modify the Uchu database in a user friendly way. You can activate this by uncommenting the lines after `# Uncomment this if you wish to use adminer` in `docker-compose.yaml`, note that you probably don't need this by default but can assist with more user friendly database management. Select the `PostgreSQL` database type, set the server to `db` and enter the credentials found in the `.env` file to login. More info on how to use Adminer can be found on their website.
 
 ## Hosting (Advanced)
 
-This Docker setup can be used to host Uchu as long as all ports are exposed (see the .env.sample file for all ports that need to be exposed). Do note that hosting Uchu on anything other than `localhost` requires a valid PFX certificate from a trusted CA like Let's Encrypt and therefore also a valid domain name. You *cannot* use a self signed certificate even if you first generate your own root certificate, as the TcpUdp mod does not look at the OS certificate store for valid root certificates. You can add a certificate to the container by adding it to this directory under the name `cert.pfx`. Finally set the `HOSTNAME` variable in the `.env` file to the hostname for the certificate.
+This Docker setup can be used to host Uchu as long as all ports are exposed (see the .env.sample file for all ports that need to be exposed). Use your firewall to port forward these ports and incoming connections should be forwarded to Uchu. Do note that hosting Uchu on anything other than `localhost` requires a valid PFX certificate from a trusted CA like Let's Encrypt and therefore also a valid domain name.
+
+You *cannot* use a self signed certificate even if you first generate your own root certificate: the TcpUdp mod does not look at the OS certificate store for valid root certificates. You can add a certificate to the container by adding it to this directory under the name `cert.pfx`. Finally set the `HOSTNAME` variable in the `.env` file to the domain name for your certificate.
diff --git a/Uchu b/Uchu
diff --git a/config.default.xml b/config.default.xml
@@ -8,7 +8,7 @@
     <Password>$POSTGRES_PASSWORD</Password>
   </Database>
   <ConsoleLogging>
-    <Level>Debug</Level>
+    <Level>$LOG_LEVEL</Level>
     <Timestamp>false</Timestamp>
   </ConsoleLogging>
   <FileLogging>

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
       - .env
     restart: always
     volumes:
-      - ${DATA_FOLDER}:/var/lib/postgresql/data
+      - ${POSTGRES_DATA_FOLDER}:/var/lib/postgresql/data
     expose:
       - 5432
   # Uncomment this if you wish to use adminer
@@ -27,7 +27,7 @@ services:
       privileged: true
       command: sh -c "./redis.sh"
       volumes:
-        - ${DATA_FOLDER}:/data:rw
+        - ${REDIS_DATA_FOLDER}:/data:rw
       expose:
         - 6379
       restart: always

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