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]