From c2d72acc422a7e2ada3fb8da3a5227836f5a8a47 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 10 Oct 2020 22:25:39 +0100 Subject: [PATCH] changed name of config --- ...mplate.cfg => secrets-common-template.cfg} | 0 ...late.cfg => secrets-instance-template.cfg} | 0 linuxgsm.sh | 20 +++++++++---------- tests/tests_fctrserver.sh | 20 +++++++++---------- tests/tests_jc2server.sh | 20 +++++++++---------- tests/tests_mcserver.sh | 20 +++++++++---------- tests/tests_ts3server.sh | 20 +++++++++---------- 7 files changed, 50 insertions(+), 50 deletions(-) rename lgsm/config-default/config-lgsm/{common-secrets-template.cfg => secrets-common-template.cfg} (100%) rename lgsm/config-default/config-lgsm/{instance-secrets-template.cfg => secrets-instance-template.cfg} (100%) diff --git a/lgsm/config-default/config-lgsm/common-secrets-template.cfg b/lgsm/config-default/config-lgsm/secrets-common-template.cfg similarity index 100% rename from lgsm/config-default/config-lgsm/common-secrets-template.cfg rename to lgsm/config-default/config-lgsm/secrets-common-template.cfg diff --git a/lgsm/config-default/config-lgsm/instance-secrets-template.cfg b/lgsm/config-default/config-lgsm/secrets-instance-template.cfg similarity index 100% rename from lgsm/config-default/config-lgsm/instance-secrets-template.cfg rename to lgsm/config-default/config-lgsm/secrets-instance-template.cfg diff --git a/linuxgsm.sh b/linuxgsm.sh index 22178d086..006fbd304 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -412,14 +412,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/common.cfg" fi - # Load the common-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-secrets-template.cfg" "${configdirserver}" "common-secrets.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-common.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" fi # Load the instance.cfg config. If missing download it. if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then @@ -430,14 +430,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/${selfname}.cfg" fi - # Load the instance-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-secrets-template.cfg" "${configdirserver}" "${selfname}-secrets.cfg" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-instance.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" fi # Load the linuxgsm.sh in to tmpdir. If missing download it. diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index 4daae44de..be310024a 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -421,14 +421,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/common.cfg" fi - # Load the common-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-secrets-template.cfg" "${configdirserver}" "common-secrets.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-common.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" fi # Load the instance.cfg config. If missing download it. if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then @@ -439,14 +439,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/${selfname}.cfg" fi - # Load the instance-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-secrets-template.cfg" "${configdirserver}" "${selfname}-secrets.cfg" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-instance.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" fi # Load the linuxgsm.sh in to tmpdir. If missing download it. diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 9e285ec99..a89c76ed8 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -422,14 +422,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/common.cfg" fi - # Load the common-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-secrets-template.cfg" "${configdirserver}" "common-secrets.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-common.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" fi # Load the instance.cfg config. If missing download it. if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then @@ -440,14 +440,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/${selfname}.cfg" fi - # Load the instance-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-secrets-template.cfg" "${configdirserver}" "${selfname}-secrets.cfg" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-instance.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" fi # Load the linuxgsm.sh in to tmpdir. If missing download it. diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index fe47dc9b2..549f200a7 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -422,14 +422,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/common.cfg" fi - # Load the common-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-secrets.cfg" "${configdirserver}" "common-secrets.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-common.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" fi # Load the instance.cfg config. If missing download it. if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then @@ -440,14 +440,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/${selfname}.cfg" fi - # Load the instance-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-secrets-template.cfg" "${configdirserver}" "${selfname}-secrets.cfg" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-instance.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" fi # Load the linuxgsm.sh in to tmpdir. If missing download it. diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index 2af42da8f..e2822a355 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -422,14 +422,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/common.cfg" fi - # Load the common-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-secrets-template.cfg" "${configdirserver}" "common-secrets.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-common.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/common-secrets.cfg" + source "${configdirserver}/secrets-common.cfg" fi # Load the instance.cfg config. If missing download it. if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then @@ -440,14 +440,14 @@ else # shellcheck source=/dev/null source "${configdirserver}/${selfname}.cfg" fi - # Load the instance-secrets.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}-secrets.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-secrets-template.cfg" "${configdirserver}" "${selfname}-secrets.cfg" "nochmodx" "norun" "noforcedl" "nomd5" + # Load the secrets-instance.cfg config. If missing download it. + if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then + fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" else # shellcheck source=/dev/null - source "${configdirserver}/${selfname}-secrets.cfg" + source "${configdirserver}/secrets-${selfname}.cfg" fi # Load the linuxgsm.sh in to tmpdir. If missing download it.