update coreconfig based on new example, also it seems a new config se…

…rvice is needed
pvarki · Mar 28, 2024 · 9aff790 · 9aff790
1 parent 72f07bf
commit 9aff790
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -46,6 +46,26 @@ services:
       retries: 3
       start_period: 5s
 
+  takserver_config:
+    <<: *takbuildinfo
+    env_file:
+      - 'takserver.env'
+    depends_on:
+      takdb:
+        condition: service_healthy
+      takserver_messaging:
+        condition: service_healthy
+    volumes:
+      - takserver_data:/opt/tak/data
+    network_mode: "service:takserver_messaging"
+    command: ./opt/scripts/start-tak.sh config
+    healthcheck:
+      test: 'true'  # FIXME
+      interval: 5s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+
   takserver_api:
     <<: *takbuildinfo
     env_file:

diff --git a/scripts/start-tak.sh b/scripts/start-tak.sh
@@ -40,6 +40,9 @@ cd ${TR}
 if [ $1 = "messaging" ]; then
     echo "Starting TAK Messaging"
     java -jar -Xmx${MESSAGING_MAX_HEAP}m -Dspring.profiles.active=messaging,consolelog -Dkeystore.pkcs12.legacy takserver.war
+elif [ $1 = "config" ]; then
+    echo "Starting TAK config"
+    java -jar -Xmx${CONFIG_MAX_HEAP}m -Dspring.profiles.active=config takserver.war &
 elif [ $1 = "api" ]; then
     echo "Starting TAK API"
     java -jar -Xmx${API_MAX_HEAP}m -Dspring.profiles.active=api,consolelog -Dkeystore.pkcs12.legacy takserver.war
@@ -50,5 +53,5 @@ elif [ $1 = "pm" ]; then
     echo "Starting TAK Plugin Manager"
     java -jar -Xmx${PLUGIN_MANAGER_MAX_HEAP}m -Dloader.path=WEB-INF/lib-provided,WEB-INF/lib,WEB-INF/classes,file:lib/ takserver-pm.jar
 else
-  echo "Please provide right TAK component: messaging, api, retention or pm"
+  echo "Please provide right TAK component: messaging, config, api, retention or pm"
 fi
diff --git a/templates/CoreConfig.tpl b/templates/CoreConfig.tpl
@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="/opt/tak/CoreConfig.xsd">
     <network multicastTTL="5">
-        <input _name="stdssl" protocol="tls" port="8089"/>
+        <input _name="stdssl" protocol="tls" port="8089" coreVersion="2"/>
 
         <!-- web connectors -->
         <connector port="8443" _name="https"/>
@@ -45,7 +45,8 @@
 
 <!-- With  "Authority Information Access" included in certs this works for both 8089 and 8443 but I see no OCSP query for 8443 -->
     <security>
-        <tls keymanager="SunX509"
+        <tls context="TLSv1.2"
+            keymanager="SunX509"
             keystore="JKS" keystoreFile="/opt/tak/data/certs/files/takserver.jks" keystorePass="{{.Env.TAKSERVER_CERT_PASS}}"
             truststore="JKS" truststoreFile="/opt/tak/data/certs/files/truststore-root.jks" truststorePass="{{.Env.CA_PASS}}"
             enableOCSP="true" responderUrl="http://{{.Env.TAK_OCSP_UPSTREAM_IP}}:{{.Env.TAK_OCSP_PORT}}"