diff --git a/ansible/roles/certstore/files/zlog.conf b/ansible/roles/certstore/files/zlog.conf deleted file mode 100644 index 39c4f10a..00000000 --- a/ansible/roles/certstore/files/zlog.conf +++ /dev/null @@ -1,14 +0,0 @@ -[global] -default format = "%d(%c), %V, %F, %U, %m%n" -rotate lock file = /tmp/certstore_zlog.lock -file perms = 644 -[levels] -DEBUG=10 -INFO=20 -FATAL=30 -[formats] -stdoutfatal = "%c %d(%c), %V, %F, %U, %m%n" -[rules] -*.fatal "./logs/error.log.%d(%F)"; -*.fatal "./logs/certstore.log.%d(%F)"; -*.fatal >stdout; stdoutfatal \ No newline at end of file diff --git a/ansible/roles/certstore/tasks/main.yml b/ansible/roles/certstore/tasks/main.yml index 2ce4e878..313818d5 100644 --- a/ansible/roles/certstore/tasks/main.yml +++ b/ansible/roles/certstore/tasks/main.yml @@ -99,12 +99,6 @@ replace: 'daemonize no' when: runtime_env == 'TSG-X-P0906' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-certstore' -- name: "copy zlog.conf to dest" - copy: - src: "{{ role_path }}/files/zlog.conf" - dest: /opt/tsg/certstore/conf/ - when: - - runtime_env == 'TSG-X-P0906' ##################### certstore ##################### - name: "systemctl daemon-reload" diff --git a/ansible/roles/sapp/files/sapp_log.conf b/ansible/roles/sapp/files/sapp_log.conf deleted file mode 100644 index df2e63ce..00000000 --- a/ansible/roles/sapp/files/sapp_log.conf +++ /dev/null @@ -1,20 +0,0 @@ -[global] -default format = "%d(%c), %V, %U, %m%n" -rotate lock file = /tmp/sapp_zlog.lock -file perms = 644 -[levels] -DEBUG=10 -INFO=20 -FATAL=30 -STOP=40 -[formats] -other = "%d(%c), %V, %F, %U, %m%n" -stdoutfatal = "%c %d(%c), %V, %F, %U, %m%n" -plugin = "%d(%c), %m%n" -[rules] -__log_runtimelog.fatal "./log/runtimelog.%d(%F)" -__log_runtimelog_plugin.fatal >stdout; plugin -__log_runtimelog_plugin.info "./log/plugin.log.%d(%F)"; plugin -__tsglog_app_sketch_local_app_sketch_local.stop "./log/%c.%d(%F)"; other -!.fatal "./log/%c.%d(%F)"; other -*.fatal >stdout; stdoutfatal diff --git a/ansible/roles/sapp/tasks/main.yml b/ansible/roles/sapp/tasks/main.yml index 0543741d..0df10cb8 100644 --- a/ansible/roles/sapp/tasks/main.yml +++ b/ansible/roles/sapp/tasks/main.yml @@ -187,13 +187,6 @@ when: - runtime_env == 'TSG-7400-mcn0' -- name: "copy zlog.conf to dest" - copy: - src: "{{ role_path }}/files/sapp_log.conf" - dest: /opt/tsg/sapp/etc/ - when: - - runtime_env == 'TSG-X-P0906' - - name: "replace action: replace service WantedBy from multi-user.target to workload.target" replace: path: "{{ item }}" diff --git a/ansible/roles/tfe/files/zlog.conf b/ansible/roles/tfe/files/zlog.conf deleted file mode 100644 index 859a9efa..00000000 --- a/ansible/roles/tfe/files/zlog.conf +++ /dev/null @@ -1,27 +0,0 @@ -# kill -s SIGHUP "pid" - -[global] - -default format = "%d(%c), %V, %F, %U, %m%n" -rotate lock file = /tmp/tfe_zlog.lock -file perms = 644 - -[levels] - -DEBUG=10 -INFO=20 -FATAL=30 -#DISABLE=40 - -[formats] -stdoutfatal = "%c %d(%c), %V, %F, %U, %m%n" - -[rules] - -*.fatal "./log/error.log.%d(%F)"; -tfe.fatal "./log/tfe.log.%d(%F)"; -http.fatal "./log/http.log.%d(%F)"; -http2.fatal "./log/http2.log.%d(%F)"; -doh.fatal "./log/doh_pxy.log.%d(%F)"; -pangu.fatal "./log/pangu_pxy.log.%d(%F)"; -*.fatal >stdout; stdoutfatal \ No newline at end of file diff --git a/ansible/roles/tfe/tasks/main.yml b/ansible/roles/tfe/tasks/main.yml index 698c9875..5833c74c 100644 --- a/ansible/roles/tfe/tasks/main.yml +++ b/ansible/roles/tfe/tasks/main.yml @@ -136,13 +136,6 @@ - {src: "tfe-env-start.sh.j2", dest: "tfe-env-start.sh" } - {src: "tfe-env-stop.sh.j2", dest: "tfe-env-stop.sh" } -- name: "copy zlog.conf to dest" - copy: - src: "{{ role_path }}/files/zlog.conf" - dest: /opt/tsg/tfe/conf/tfe/ - when: - - runtime_env == 'TSG-X-P0906' - ##################### tfe ##################### - name: "systemctl daemon-reload" systemd: