From 704137436df2684f9a19d334d29710c2f2948ddd Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 14 Oct 2020 15:51:57 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=20tsg-diagnose=20?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E9=87=8D=E5=90=AF=E5=90=8E=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/rsync/init_rsyncd.sh | 4 ++-- docker-compose/tsg-diagnose.service | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/rsync/init_rsyncd.sh b/deploy/rsync/init_rsyncd.sh index d53fc68..4022984 100644 --- a/deploy/rsync/init_rsyncd.sh +++ b/deploy/rsync/init_rsyncd.sh @@ -1,5 +1,5 @@ #!/bin/sh mkdir -p /opt/tsg/tsg-diagnose/.badssl_cert_dict/CA -cp /opt/tsg/tsg-diagnose/.badssl_cert_dict/certs/sets/current/gen/crt/ca-root.crt /opt/tsg/tsg-diagnose/.badssl_cert_dict/CA -cp /opt/tsg/tsg-diagnose/etc/wpr_cert.pem /opt/tsg/tsg-diagnose/.badssl_cert_dict/CA +/bin/cp -rf /opt/tsg/tsg-diagnose/.badssl_cert_dict/certs/sets/current/gen/crt/ca-root.crt /opt/tsg/tsg-diagnose/.badssl_cert_dict/CA +/bin/cp -rf /opt/tsg/tsg-diagnose/etc/wpr_cert.pem /opt/tsg/tsg-diagnose/.badssl_cert_dict/CA rsync --daemon --config=/opt/tsg/tsg-diagnose/deploy/rsync/rsyncd.conf \ No newline at end of file diff --git a/docker-compose/tsg-diagnose.service b/docker-compose/tsg-diagnose.service index 19c36ed..b3406be 100644 --- a/docker-compose/tsg-diagnose.service +++ b/docker-compose/tsg-diagnose.service @@ -1,13 +1,13 @@ [Unit] Description=Tsg diagnose -Requires=docker.service -After=docker.service +Requires=docker.service tsg-env.service +After=docker.service tsg-env.service [Service] Type=oneshot RemainAfterExit=yes WorkingDirectory=/opt/tsg/tsg-diagnose/compose/%i -ExecStart=/bin/sh -c "docker-compose up -d --remove-orphans" +ExecStart=/bin/sh -c "docker-compose down --remove-orphans; docker-compose up -d --remove-orphans" ExecStop=/bin/sh -c "docker-compose down --remove-orphans" [Install]