clean house

This commit is contained in:
2026-07-15 16:49:18 -05:00
parent 0e3f78b695
commit 117821b738
+5 -6
View File
@@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/env sh
#### ####
#### WARNING: #### WARNING:
@@ -25,9 +25,8 @@
GIT_REPO_BASE="https://gitea.admin-a.hpetersenfamily.com/heath/ansible" GIT_REPO_BASE="https://gitea.admin-a.hpetersenfamily.com/heath/ansible"
GIT_REPO="${GIT_REPO_BASE}.git" GIT_REPO="${GIT_REPO_BASE}.git"
GIT_REPO_BRANCH="${1:-"production"}" GIT_REPO_BRANCH="${1:-"production"}"
GIT_REPO_sudoers_d_hpf="${GIT_REPO_BASE}/raw/branch/main/files/etc_sudoers_d_hpf" GIT_REPO_sudoers_d_hpf="${GIT_REPO_BASE}/raw/branch/${GIT_REPO_BRANCH}/files/etc_sudoers_d_hpf"
GIT_REPO_ansible_pull_sh="${GIT_REPO_BASE}/raw/branch/main/files/home_hpf_ans_bin_ansible_pull_sh" GIT_REPO_ansible_pull_sh="${GIT_REPO_BASE}/raw/branch/${GIT_REPO_BRANCH}/files/home_hpf_ans_bin_ansible_pull_sh"
ETC_sudoers_d_hpf="/etc/sudoers.d/hpf" ETC_sudoers_d_hpf="/etc/sudoers.d/hpf"
@@ -89,7 +88,7 @@ add_groups_to_user () {
# $command_line # $command_line
as_hpf_ans () { as_hpf_ans () {
su --login hpf-ans -c "if [ -r \"${HPF_ANS_activate}\" ] ; then source \"${HPF_ANS_activate}\" ; fi ; ${1}" su --login hpf-ans --command "if [ -r \"${HPF_ANS_activate}\" ] ; then source \"${HPF_ANS_activate}\" ; fi ; ${1}"
} }
@@ -151,4 +150,4 @@ mkdir -p "${ANSIBLE_PULL_SH_LOG_DIR}"
chown hpf-ans:root "${ANSIBLE_PULL_SH_LOG_DIR}"; chmod ug=rwx,o= "${ANSIBLE_PULL_SH_LOG_DIR}" chown hpf-ans:root "${ANSIBLE_PULL_SH_LOG_DIR}"; chmod ug=rwx,o= "${ANSIBLE_PULL_SH_LOG_DIR}"
# Run ansible-pull to finish up # Run ansible-pull to finish up
as_hpf_ans "bin/ansible-pull.sh --branch ${GIT_REPO_BRANCH} bootstrap.yml" as_hpf_ans "$HPF_ANS_ansible_pull_sh --branch ${GIT_REPO_BRANCH} bootstrap.yml"