From 48043f78cc95cf8271c9b8d740ed8959b131276b Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Sun, 5 Jun 2022 21:54:08 +0200 Subject: [PATCH] reimplemented after reordering conf-file --- read_config | 132 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 83 insertions(+), 49 deletions(-) diff --git a/read_config b/read_config index 3d41a64..dda5b2b 100755 --- a/read_config +++ b/read_config @@ -10,80 +10,114 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once # read_config() { local func="${FUNCNAME[0]}" - - # check customer_id - __customer_id="$(cat "$1" | jq -r .customer_id)" - if [ -z "$__customer_id" ]; then - log_fatal "$func:${LINENO} customer_id not set in $1" - fi - readonly customer_id="customer_${__customer_id}" - log_info "$func:${LINENO}: customer-id is $customer_id" - # check customer_repository - __repository_path="$(cat "$1" | jq -r .repository_path)" - if [ -z "$__repository_path" ]; then - log_fatal "$func:${LINENO}: repository path not set in $1" + readonly GIT_SSL_NO_VERIFY="$(cat "$1" | jq -r .GIT_SSL_NO_VERIFY)" + if [ -z "$GIT_SSL_NO_VERIFY" ]; then + log_fatal "$func:${LINENO} GIT_SSL_NO_VERIFY not set in $1" fi - readonly repository_path="${__repository_path}/${customer_id}.git" - log_info "$func:${LINENO}: repository path is $repository_path" + log_debug "$func:${LINENO}: GIT_SSL_NO_VERIFY=$GIT_SSL_NO_VERIFY" - # check zone_group - local zone_group="$(cat "$1" | jq -r .zone_group)" - if [ -z "$zone_group" ]; then - log_fatal "$func:${LINENO}: zone_group not set in $1" + readonly working_directory="$(cat "$1" | jq -r .working_directory)" + if [ -z "$working_directory" ]; then + log_fatal "$func:${LINENO}: working_directory not set in $1" fi + log_debug "$func:${LINENO}: working_directory=$working_directory" - # check zone - local zone="$(cat "$1" | jq -r .zone)" - if [ -z "$zone" ]; then - log_fatal "$func:${LINENO}: zone not set in $1" + readonly workspace_dir="$(cat "$1" | jq -r .workspace_dir)" + if [ -z "$workspace_dir" ]; then + log_fatal "$func:${LINENO}: workspace_dir not set in $1" fi + log_debug "$func:${LINENO}: workspace_dir=$working_dir" - # check customer_location local customer_location=$(cat "$1" | jq -r .customer_location) if [ -z "$customer_location" ]; then log_fatal "$func:${LINENO}: customer_location not set in $1" fi + log_debug "$func:${LINENO}: customer-location=$customer_location" + + readonly customer_id="customer_$(cat "$1" | jq -r .customer_id)" + if [ -z "$customer_id" ]; then + log_fatal "$func:${LINENO} customer_id not set in $1" + fi + log_debug "$func:${LINENO}: customer-id=$customer_id" - readonly working_directory="$(cat "$1" | jq -r .working_directory)" - - log_info "$func:${LINENO}: working_directory is $working_directory" - - readonly workspace_dir="$(cat "$1" | jq -r .workspace_dir)" + local __r_path="$(cat "$1" | jq -r .cust_repository_path)" + if [ -z "$__r_path" ]; then + log_fatal "$func:${LINENO}: customer repository path not set in $1" + fi + readonly customer_repository_path="${__r_path}/${customer_id}.git" + log_debug "$func:${LINENO}: customer r-path=$customer_repository_path" + + readonly number_of_zone_groups="$(cat "$1" | jq -r .zone_group[0])" + log_debug "$func:${LINENO}: $number_of_zone_groups zone_group(s)" + + local __zone_groups=(0) + for zg in `seq 1 $number_of_zone_groups`; do + local __n_zones="$(cat "$1" | jq -r .zone_group[$zg].zone[0])" + __zone_groups[$zg]=$__n_zones + done + +############################################################################### +########################## parsing with jq finished ########################### +############################################################################### local __customer_base_dir="$working_directory/${workspace_dir}" __customer_base_dir="${__customer_base_dir}/${customer_id}" __customer_base_dir="${__customer_base_dir}/${customer_location}" readonly customer_location_dir="$__customer_base_dir" - - log_info "$func:${LINENO}: customer-location-dir is $customer_location_dir" + log_debug "$func:${LINENO}: customer_location_dir=" + log_debug "$func:${LINENO}: $customer_location_dir" readonly update_conf="${customer_location_dir}/update.conf" - log_info "$func:${LINENO}: update.conf at $update_conf" + log_debug "$func:${LINENO}: update.conf=" + log_debug "$func:${LINENO}: $update_conf" readonly current_conf="${customer_location_dir}/current.conf" - log_info "$func:${LINENO}: current.conf at $current_conf" - - readonly customer_base_dir="${__customer_base_dir}/${zone_group}/${zone}" - log_info "$func:${LINENO}: customer-base-dir is $customer_base_dir" - - readonly psa_config="${customer_base_dir}/etc/psa_config" - readonly psa_update="${customer_base_dir}/etc/psa_update" - readonly psa_ini="${customer_base_dir}/etc/psa_ini" + log_debug "$func:${LINENO}: current.conf=" + log_debug "$func:${LINENO}: $current_conf" - readonly emp_conf="${psa_config}/emp.conf" - log_info "$func:${LINENO}: emp.conf at $emp_conf" - - readonly device_conf="${psa_config}/device.conf" - log_info "$func:${LINENO}: device.conf at $device_conf" - - readonly printer_conf="${psa_config}/printer.conf" - log_info "$func:${LINENO}: device.conf at $printer_conf" + # readonly zone_groups=(${__zone_groups[@]}) + # for (( j=0; j<${#zone_groups[@]}; ++j)); do + # log_debug "$func:${LINENO}: zgroup[$j]: ${zone_groups[$j]} zones" + # done - readonly opkg_cmds_file="${psa_update}/opkg_commands" - log_info "$func:${LINENO}: opkg_cmds_file at $opkg_cmds_file" + # TODO: falls mehrere gruppen/zonen auftauchen hier anpassen + readonly zgroup=1 + readonly zone=1 + readonly customer_base_dir="${__customer_base_dir}/${zgroup}/${zone}" + log_debug "$func:${LINENO}: customer-base-dir=" + log_debug "$func:${LINENO}: $customer_base_dir" + readonly psa_config_dir="${customer_base_dir}/etc/psa_config" + log_debug "$func:${LINENO}: psa_config_dir=" + log_debug "$func:${LINENO}: $psa_config_dir" + + readonly psa_update_dir="${customer_base_dir}/etc/psa_update" + log_debug "$func:${LINENO}: psa_update_dir=" + log_debug "$func:${LINENO}: $psa_update_dir" + + readonly psa_base_ini_dir="${customer_base_dir}/opt/app" + log_debug "$func:${LINENO}: psa_base_ini_dir=" + log_debug "$func:${LINENO}: $psa_base_ini_dir" + + readonly emp_conf="${psa_config_dir}/emp.conf" + log_debug "$func:${LINENO}: emp.conf=" + log_debug "$func:${LINENO}: $emp_conf" + + readonly device_conf="${psa_config_dir}/device.conf" + log_debug "$func:${LINENO}: device.conf=" + log_debug "$func:${LINENO}: $device_conf" + + readonly printer_conf="${psa_config_dir}/printer.conf" + log_debug "$func:${LINENO}: printer.conf=" + log_debug "$func:${LINENO}: $printer_conf" + + readonly opkg_cmds_file="${psa_update_dir}/opkg_commands" + log_debug "$func:${LINENO}: opkg_commands=" + log_debug "$func:${LINENO}: $opkg_cmds_file" + + # FIXME: die "ini"-files fehlen noch return 0 } # read_config UpdateController.conf