sbrl/cluster-deployment
1
0
Fork 0
Code Issues Pull requests Releases Activity

fix a few shellcheck errors
Some checks are pending
continuous-integration/laminar-eldarion Build failed with exit code 123 after 2 seconds
Details

Browse source
This commit is contained in:
Starbeamrainbowlabs 2022-06-24 23:44:07 +01:00
parent 5a5309e23a
commit 41f5d8738a
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
4 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/run.sh
View file

@ -164,6 +164,7 @@ step_current="1";
stage_begin "Configuring software choices"; stage_begin "Configuring software choices";
source ./steps-config/10-hostname.sh; source ./steps-config/10-hostname.sh;
if ask_yesno "Use apt-cacher-ng server?"; then if ask_yesno "Use apt-cacher-ng server?"; then

2
src/steps-config/50-wesher-wireguard.sh
View file

@ -1,7 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#shellcheck disable=SC2034
wesher_secret="$(ask_password "wesher configuration" "Enter the wesher shared secret:")"; wesher_secret="$(ask_password "wesher configuration" "Enter the wesher shared secret:")";
#shellcheck disable=SC2034
wesher_join_ip="$(ask_text "wesher configuration" "Enter an IP of a host in the cluster to join:")"; wesher_join_ip="$(ask_text "wesher configuration" "Enter an IP of a host in the cluster to join:")";
queue_apt_install "raspberrypi-kernel-headers" "wireguard" "wesher" "wesher-systemd"; queue_apt_install "raspberrypi-kernel-headers" "wireguard" "wesher" "wesher-systemd";

1
src/steps-postinstall/10-wesher.sh
View file

@ -10,6 +10,7 @@ task_end "$?";
task_begin "wesher: joining cluster" task_begin "wesher: joining cluster"
# HACK: Ref https://github.com/costela/wesher/issues/70 # HACK: Ref https://github.com/costela/wesher/issues/70
#shellcheck disable=SC2154
WESHER_CLUSTER_KEY="${wesher_secret}" wesher /usr/local/sbin/wesher --overlay-net 172.31.250.0/16 --log-level info --join "${wesher_join_ip}" & WESHER_CLUSTER_KEY="${wesher_secret}" wesher /usr/local/sbin/wesher --overlay-net 172.31.250.0/16 --log-level info --join "${wesher_join_ip}" &
sleep 5; sleep 5;

2
src/steps-postinstall/20-collectd.sh
View file

@ -21,7 +21,7 @@ subtask_begin "Installing configuration file";
touch "${collectd_conf_target}"; touch "${collectd_conf_target}";
chmod 0600 "${collectd_conf_target}"; chmod 0600 "${collectd_conf_target}";
#shellcheck disable=SC2154 #shellcheck disable=SC2154
cat configs/collectd.conf | awk -v "user=${collectd_username}" -v "pass=${collectd_password}" '{ gsub("|||USERNAME|||", user); gsub("|||PASSWORD|||", pass); print }' >"${collectd_conf_target}"; awk -v "user=${collectd_username}" -v "pass=${collectd_password}" '{ gsub("|||USERNAME|||", user); gsub("|||PASSWORD|||", pass); print }' >"${collectd_conf_target}" <"configs/collectd.conf";
subtask-end "$?"; subtask-end "$?";
subtask_begin "Starting collectd & enabling on boot"; subtask_begin "Starting collectd & enabling on boot";