Merge branch 'tickets/DM-53921' into tickets/DM-43715

Author: fritzm

deploy/compose/docker-compose.yml

@@ -103,7 +103,7 @@ services:
           --repl-registry-host repl-registry
           --repl-registry-port 25082
           --results-dirname /qserv/data/results
-          --log-cfg-file=/config-etc/log/log-worker-svc.cnf
+          --log-cfg-file=/config-etc/log/log-worker-svc.cfg
         volumes:
             - type: volume
               source: volume_worker_0_results
@@ -124,8 +124,8 @@ services:
         command: >
           entrypoint worker-repl
           --db-admin-uri mysql://root:CHANGEME@worker-mariadb-0:3306/qservw_worker
-          --repl-connection mysql://qsreplica@repl-mariadb:3306/qservReplica
-          --log-cfg-file=/config-etc/log/log-repl-worker.cnf
+          --repl-connection mysql://qsreplica:CHANGEME@repl-mariadb:3306/qservReplica
+          --log-cfg-file=/config-etc/log/log-repl-worker.cfg
           --
           --instance-id=qserv_proj
           --auth-key=replauthkey
@@ -176,7 +176,7 @@ services:
           --repl-registry-port 25082
           --results-dirname /qserv/data/results
           --targs db_socket=/qserv/mariadb/run/mysqld.sock
-          --log-cfg-file=/config-etc/log/log-worker-svc.cnf
+          --log-cfg-file=/config-etc/log/log-worker-svc.cfg
         volumes:
             - type: volume
               source: volume_worker_1_results
@@ -198,8 +198,8 @@ services:
         command: >
           entrypoint worker-repl
           --db-admin-uri mysql://root:CHANGEME@worker-mariadb-1:3306/qservw_worker
-          --repl-connection mysql://qsreplica@repl-mariadb:3306/qservReplica
-          --log-cfg-file=/config-etc/log/log-repl-worker.cnf
+          --repl-connection mysql://qsreplica:CHANGEME@repl-mariadb:3306/qservReplica
+          --log-cfg-file=/config-etc/log/log-repl-worker.cfg
           --
           --instance-id=qserv_proj
           --auth-key=replauthkey
@@ -250,7 +250,7 @@ services:
           --db-uri mysql://qsmaster:CHANGEME@127.0.0.1:3306?socket={{db_socket}}
           --db-admin-uri mysql://root:CHANGEME@127.0.0.1:3306?socket={{db_socket}}
           --targs db_socket=/qserv/mariadb/run/mysqld.sock
-          --log-cfg-file=/config-etc/log/log-czar-proxy.cnf
+          --log-cfg-file=/config-etc/log/log-czar-proxy.cfg
           --repl-instance-id qserv_proj
           --repl-auth-key replauthkey
           --repl-admin-auth-key=repladminauthkey
@@ -272,7 +272,7 @@ services:
             - type: volume
               source: volume_czar_transfer
               target: /tmp
-              
+
             - << : *log-volume
         expose:
             - "3306" # for czar-mariadb
@@ -299,7 +299,7 @@ services:
           --http-conn-pool-size 2
           --user qsmaster
           --password CHANGEME
-          --log-cfg-file=/config-etc/log/log-czar-proxy.cnf
+          --log-cfg-file=/config-etc/log/log-czar-proxy.cfg
           --repl-instance-id qserv_proj
           --repl-auth-key replauthkey
           --repl-admin-auth-key=repladminauthkey
@@ -343,10 +343,10 @@ services:
         init: true
         command: >
           entrypoint --log-level DEBUG replication-controller
-          --db-uri mysql://qsreplica@repl-mariadb:3306/qservReplica
+          --db-uri mysql://qsreplica:CHANGEME@repl-mariadb:3306/qservReplica
           --db-admin-uri mysql://root:CHANGEME@repl-mariadb:3306/qservReplica
           --qserv-czar-db=mysql://root:CHANGEME@czar-mariadb:3306/qservMeta
-          --log-cfg-file=/config-etc/log/log-repl-controller.cnf
+          --log-cfg-file=/config-etc/log/log-repl-controller.cfg
           --
           --instance-id=qserv_proj
           --auth-key=replauthkey
@@ -376,9 +376,9 @@ services:
         init: true
         command: >
           entrypoint --log-level DEBUG replication-registry
-          --db-uri mysql://qsreplica@repl-mariadb:3306/qservReplica
+          --db-uri mysql://qsreplica:CHANGEME@repl-mariadb:3306/qservReplica
           --db-admin-uri mysql://root:CHANGEME@repl-mariadb:3306/qservReplica
-          --log-cfg-file=/config-etc/log/log-repl-registry.cnf
+          --log-cfg-file=/config-etc/log/log-repl-registry.cfg
           --
           --instance-id=qserv_proj
           --auth-key=replauthkey

deploy/compose/log/log-czar-proxy.cnf deploy/compose/log/log-czar-proxy.cfgdeploy/compose/log/log-czar-proxy.cnf renamed to deploy/compose/log/log-czar-proxy.cfg

@@ -20,7 +20,7 @@ COPY --chown=qserv:qserv lua/ /usr/local/lua/
 COPY --chown=qserv:qserv python/ /usr/local/python/
 COPY --chown=qserv:qserv qserv/ /usr/local/qserv/
 COPY --chown=qserv:qserv etc/ /usr/local/etc/
-COPY --chown=qserv:qserv etc/log.cnf /config-etc/log/log.cnf
+COPY --chown=qserv:qserv etc/log.cfg /config-etc/log/log.cfg
 
 RUN ldconfig
 

…ploy/compose/log/log-repl-controller.cnf …ploy/compose/log/log-repl-controller.cfgdeploy/compose/log/log-repl-controller.cnf renamed to deploy/compose/log/log-repl-controller.cfg deploy/compose/log/log-repl-controller.cnf renamed to deploy/compose/log/log-repl-controller.cfg

@@ -1,5 +1,5 @@
 install(FILES
     integration_tests.yaml
-    log.cnf
+    log.cfg
     DESTINATION etc
 )