From faf6360b871ca6499ae524e2f27cd19706723066 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 8 May 2023 21:24:31 +0300
Subject: [PATCH] debug + JAVA_HOME

---
 config/nocloud/user-data     | 9 ++++++++-
 config/src/srv1cv83@.service | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/config/nocloud/user-data b/config/nocloud/user-data
index 4b1f8cb..64f1007 100644
--- a/config/nocloud/user-data
+++ b/config/nocloud/user-data
@@ -53,6 +53,7 @@ autoinstall:
       - cups
       - wsdd
       - libxt6
+      - libtcmalloc-minimal4
   late-commands:
     - stat /cdrom/1c/install >/dev/null 2>/dev/null && sh -exc "mkdir -p /target/var/install/1c && cp /cdrom/1c/install/* /target/var/install/1c/" || echo skip 1c distr copy
     - sync
@@ -224,7 +225,13 @@ autoinstall:
         # stat /var/install/1c >/dev/null 2>/dev/null && $(find /tmp/1c -name "setup-full-*.run" -type f) --mode unattended --enable-components additional_admin_functions,integrity_monitoring,config_storage_server,client_full,client_thin_fib,liberica_jre,server,server_admin,ws,ru || echo skip 1c install
         stat /tmp/1c >/dev/null 2>/dev/null && rm -rf /tmp/1c || echo skip 1c install
         stat /opt/1cv8/x86_64 >/dev/null 2>/dev/null && ln -s $(find /opt/1cv8/x86_64 -name "8.3.*" -type d) /opt/1cv8/x86_64/current || echo skip 1c install
-      
+        
+      # --- 1c config ---
+      - |
+        echo "JavaHome=/opt/1cv8/x86_64/current/jre" >> /opt/1cv8/conf/conf.cfg
+        echo "JAVA_HOME=/opt/1cv8/x86_64/current/jre" >> /opt/1cv8/conf/conf.cfg
+        echo "UpdateDBCfg=v2" >> /opt/1cv8/conf/conf.cfg
+
       # --- 1c web init ---
       - |
         set -x  
diff --git a/config/src/srv1cv83@.service b/config/src/srv1cv83@.service
index 0c32e69..ff80bcd 100644
--- a/config/src/srv1cv83@.service
+++ b/config/src/srv1cv83@.service
@@ -7,6 +7,8 @@ Type=simple
 User=usr1cv8
 Group=grp1cv8
 
+Environment=JAVA_HOME=/opt/1cv8/x86_64/%I/jre
+
 # Path to directory with claster data
 Environment=SRV1CV8_DATA=/home/usr1cv8/.1cv8/1C/1cv8/
 
@@ -33,7 +35,7 @@ Environment=SRV1CV8_SECLEV=0
 # blank - default - debug mode is off
 # -debug - debug mode is on
 #
-Environment=SRV1CV8_DEBUG=
+Environment=SRV1CV8_DEBUG=-debug -http
 
 # Check period for connection loss detector, milliseconds
 Environment=SRV1CV8_PING_PERIOD=1000
@@ -54,4 +56,4 @@ PrivateTmp=no
 
 [Install]
 DefaultInstance=current
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target