Browse Source

changed name of config

pull/3080/head
Daniel Gibbs 5 years ago
parent
commit
c2d72acc42
  1. 0
      lgsm/config-default/config-lgsm/secrets-common-template.cfg
  2. 0
      lgsm/config-default/config-lgsm/secrets-instance-template.cfg
  3. 20
      linuxgsm.sh
  4. 20
      tests/tests_fctrserver.sh
  5. 20
      tests/tests_jc2server.sh
  6. 20
      tests/tests_mcserver.sh
  7. 20
      tests/tests_ts3server.sh

0
lgsm/config-default/config-lgsm/common-secrets-template.cfg → lgsm/config-default/config-lgsm/secrets-common-template.cfg

0
lgsm/config-default/config-lgsm/instance-secrets-template.cfg → lgsm/config-default/config-lgsm/secrets-instance-template.cfg

20
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.

20
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.

20
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.

20
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.

20
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.

Loading…
Cancel
Save