From 1a2bb566c11f0f1c14aa616e07d66ef7904331c9 Mon Sep 17 00:00:00 2001 From: jblu Date: Sat, 22 Jul 2023 23:09:11 -0500 Subject: [PATCH] changed to a url --- .drone.yml | 24 ++++++------------------ phc.sh | 6 ++---- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index ad69fa0..3213670 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,21 +39,15 @@ steps: from_secret: PHC_HEALTHCHECK_URL PHC_HEALTHCHECK_ID: from_secret: PHC_HEALTHCHECK_ID - PHC_PLEX_HOST: - from_secret: PHC_PLEX_HOST - PHC_PLEX_PROTOCOL: - from_secret: PHC_PLEX_PROTOCOL - PHC_PLEX_PORT: - from_secret: PHC_PLEX_PORT + PHC_PLEX_URL: + from_secret: PHC_PLEX_URL CRON: from_secret: CRON commands: - echo $PHC_PLEX_SECRET_TOKEN - echo $PHC_HEALTHCHECK_URL - echo $PHC_HEALTHCHECK_ID - - echo $PHC_PLEX_HOST - - echo $PHC_PLEX_PROTOCOL - - echo $PHC_PLEX_PORT + - echo $PHC_PLEX_URL - echo $CRON - /bin/sh /opt/phc.sh when: @@ -68,21 +62,15 @@ steps: from_secret: PHC_HEALTHCHECK_URL PHC_HEALTHCHECK_ID: from_secret: PHC_HEALTHCHECK_ID - PHC_PLEX_HOST: - from_secret: PHC_PLEX_HOST - PHC_PLEX_PROTOCOL: - from_secret: PHC_PLEX_PROTOCOL - PHC_PLEX_PORT: - from_secret: PHC_PLEX_PORT + PHC_PLEX_URL: + from_secret: PHC_PLEX_URL CRON: from_secret: CRON commands: - echo $PHC_PLEX_SECRET_TOKEN - echo $PHC_HEALTHCHECK_URL - echo $PHC_HEALTHCHECK_ID - - echo $PHC_PLEX_HOST - - echo $PHC_PLEX_PROTOCOL - - echo $PHC_PLEX_PORT + - echo $PHC_PLEX_URL - echo $CRON - /bin/sh /opt/phc.sh when: diff --git a/phc.sh b/phc.sh index 56cb2d8..e234c6c 100644 --- a/phc.sh +++ b/phc.sh @@ -1,11 +1,9 @@ : "${PHC_PLEX_SECRET_TOKEN:?Must set PHC_SECRET_TOKEN env variable}" : "${PHC_HEALTHCHECK_URL:?Must set PHC_HEALTHCHECK_URL env variable}" : "${PHC_HEALTHCHECK_ID:?Must set PHC_HEALTHCHECK_ID env variable}" -: "${PHC_PLEX_HOST:?Must set PHC_PLEX_HOST env variable}" -: "${PHC_PLEX_PORT:-32400}" -: "${PHC_PLEX_PROTOCOL:-"http"}" +: "${PHC_PLEX_URL:?Must set PHC_PLEX_URL env variable}" -URL="${PHC_PLEX_PROTOCOL}://${PHC_PLEX_HOST}:${PHC_PLEX_PORT}/connections?X-Plex-Token=${PHC_PLEX_SECRET_TOKEN}" +URL="${PHC_PLEX_URL}/connections?X-Plex-Token=${PHC_PLEX_SECRET_TOKEN}" ping_hc() { curl -fsS -m 10 --retry 5 -o /dev/null --data-raw "$2" "${PHC_HEALTHCHECK_URL}/ping/${PHC_HEALTHCHECK_ID}/$1"