diff --git a/bootstrap.sh b/bootstrap.sh index 4702b8b..f445fee 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -7,8 +7,8 @@ GIT_REPO_BASE="https://gitea.admin-a.hpetersenfamily.com/heath/ansible" GIT_REPO="${GIT_REPO_BASE}.git" -GIT_REPO_ETC_SUDOERS_D_HPF="${GIT_REPO_BASE}/raw/branch/main/etc_sudoers_d_hpf" -GIT_REPO_HOME_HPF_ANS_BIN_ANSIBLE_PULL_SH="${GIT_REPO_BASE}/raw/branch/main/home_hpf_ans_bin_ansible-pull.sh" +GIT_REPO_etc_sudoers_d_hpf="${GIT_REPO_BASE}/raw/branch/main/etc_sudoers_d_hpf" +GIT_REPO_home_hpf_ans_bin_ansible_pull_sh="${GIT_REPO_BASE}/raw/branch/main/home_hpf_ans_bin_ansible-pull.sh" VENV_DIRECTORY="\${HOME}/.ansible-venv" VENV_ACTIVATE="${VENV_DIRECTORY}/bin/activate" @@ -101,7 +101,7 @@ add_groups_to_user "hpf-sudo-np" hpf-ans # Create /etc/sudoers.d/hpf f="/etc/sudoers.d/hpf" rm "${f}" 2>/dev/null -curl -o "$f" "${GIT_REPO_ETC_SUDOERS_D_HPF}" +curl -o "$f" "${GIT_REPO_etc_sudoers_d_hpf}" chown root:root "$f" chmod u=rw,g=r,o= "$f" @@ -121,7 +121,7 @@ as_hpf_ans "mkdir -p \"${d}\"; chown hpf-ans:hpf-ans \"${d}\"; chmod ug=rwx,o= \ # Create ~hpf-ans/bin/ansible-pull.sh f="\${HOME}/bin/ansible-pull.sh" as_hpf_ans "rm \"${f}\" 2>/dev/null" -as_hpf_ans "curl -o \"${f}\" \"${GIT_REPO_HOME_HPF_ANS_BIN_ANSIBLE_PULL_SH}\"" +as_hpf_ans "curl -o \"${f}\" \"${GIT_REPO_home_hpf_ans_bin_ansible_pull_sh}\"" as_hpf_ans "chown hpf-ans:hpf-ans \"${f}\"; chmod ug=rwx,o= \"${f}\"" # Run ansible-pull to finish up