diff --git a/templates/script/usage.erb.sh b/templates/script/usage.erb.sh index 4c8ea58..4d63a61 100644 --- a/templates/script/usage.erb.sh +++ b/templates/script/usage.erb.sh @@ -13,10 +13,10 @@ else allowmixedcustomers=no fi yaml="/etc/hiera/data/common.yaml" -remotes=( $(yq -r ".project_mapping.${customer}.<% @=environment %>.primary_project" ${yaml})) -remotes+=($(yq -r ".project_mapping.${customer}.<% @=environment %>.mirror_project" ${yaml})) -remotes+=($(yq -r ".project_mapping.${customer}.<% @=environment %>.assigned | .[].project" ${yaml})) -remotes+=($(yq -r ".project_mapping.${customer}.<% @=environment %>.assigned | .[].mirror_project" ${yaml})) +remotes=( $(yq -r ".project_mapping.${customer}.<%= @environment %>.primary_project" ${yaml})) +remotes+=($(yq -r ".project_mapping.${customer}.<%= @environment %>.mirror_project" ${yaml})) +remotes+=($(yq -r ".project_mapping.${customer}.<%= @environment %>.assigned | .[].project" ${yaml})) +remotes+=($(yq -r ".project_mapping.${customer}.<%= @environment %>.assigned | .[].mirror_project" ${yaml})) userjson=$(rclone cat --no-check-certificate --webdav-headers "Host,sunet.drive.sunet.se" --use-cookies "statistics:drive-server-coms/${location}/users.json") users=$(echo ${userjson} | jq -r '.| keys | .[] | test("^((?!(^admin|^[_])).)*$")' | grep true | wc -l) outfile1="${customer}-${date}-detailed.csv"