diff --git a/docker-compose.yml b/docker-compose.yml index b0d2cace609ad22c373d7b15581a57f69ba86136..7fbb89a0d94818fc271fbc3f3554fd5127cc535c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,7 +68,7 @@ services: env_file: - ./.env volumes: - - ./logs/reports-acumulator:/logs + - ./logs/reports-accumulator:/logs restart: unless-stopped # Running on port 3000 @@ -299,6 +299,25 @@ services: - loki restart: always + # Ntfy + # Running on port 80 + ntfy: + image: binwiederhier/ntfy + container_name: ntfy + command: + - serve + environment: + - TZ=UTC + ports: + - 8003:80 + healthcheck: # optional: remember to adapt the host:port to your environment + test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s:\\strue' || exit 1"] + interval: 60s + timeout: 10s + retries: 3 + start_period: 40s + restart: unless-stopped + networks: reports-net: adm-net: diff --git a/setup-debian.sh b/setup-debian.sh index be35cc6154e0eab85d21eda7f2a9285bf9109690..604d49af173956fe7159cc8b04d0da494d87f286 100755 --- a/setup-debian.sh +++ b/setup-debian.sh @@ -243,7 +243,7 @@ setup_env() { update_env_variable "REPORTS_CRUNCHER_VERSION" "0.2.0" "$ENV_SHEPHERD_PATH" update_env_variable "REPORTS_ENGINE_VERSION" "0.3.0" "$ENV_SHEPHERD_PATH" update_env_variable "TAG" "0.5.1" "$ENV_SHEPHERD_PATH" - update_env_variable "ONEAPI_VERSION" "2.1.5" "$ENV_SHEPHERD_PATH" + update_env_variable "ONEAPI_VERSION" "2.1.6" "$ENV_SHEPHERD_PATH" update_env_variable "NANOMDM_SCEP_URL" "http://0.0.0.0:8080" "$ENV_SHEPHERD_PATH" update_env_variable "NANOMDM_MDM_URL" "http://0.0.0.0:9001" "$ENV_SHEPHERD_PATH" @@ -252,6 +252,11 @@ setup_env() { update_env_variable "REPORTS_CRUNCHER_API" "http://reports_cruncher:3000" "$ENV_SHEPHERD_PATH" # accessed by dashboard update_env_variable "REPORTS_URL" "http://0.0.0.0:3030" "$ENV_SHEPHERD_PATH" + update_env_variable "APP_DEBUG" "false" "$ENV_SHEPHERD_PATH" + + update_env_variable "NTFY_WS_URL" "ws://0.0.0.0:8003" "$ENV_SHEPHERD_PATH" + update_env_variable "NTFY_AUTH_TOKEN" "" "$ENV_SHEPHERD_PATH" + update_env_variable "NTFY_API_URL" "http://0.0.0.0:8003" "$ENV_SHEPHERD_PATH" # NOTE: Only need to be updated once # ADM required variables @@ -266,6 +271,9 @@ setup_env() { # echo "NTFY_WS_URL=wss://ntfy.sh" >> "$ENV_SHEPHERD_PATH" # echo "NTFY_AUTH_TOKEN=***REMOVED***" >> "$ENV_SHEPHERD_PATH" # echo "NTFY_API_URL=https://ntfy.sh" >> "$ENV_SHEPHERD_PATH" + + ONE_TOKEN=$(extract_env_value_or_exit "BASIC_BEARER_TOKEN" "$ENV_CLIENT_PATH") + echo "ONE_TOKEN=$ONE_TOKEN" >> "$ENV_CLIENT_PATH" # Caddy file replace echo "Generating caddyfile..."