diff --git a/.gitignore b/.gitignore index 6a544c3..b3fdcbd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ playbook.retry *.log .idea/ venv/ +/ansible.cfg diff --git a/Makefile b/Makefile index 4c47f67..812dfbe 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,10 @@ -init: create_venv install_pre_commit install_ansible_galaxy_modules +init: create_ansible_cfg create_venv install_pre_commit install_ansible_galaxy_modules + +.ONESHELL: +create_ansible_cfg: + read -rp "Enter remote username: " REMOTE_USER + cp ansible.cfg.sample ansible.cfg + sed -i "s/REMOTE_USER/$$REMOTE_USER/g" ansible.cfg create_venv: python3 -m venv venv @@ -9,4 +15,4 @@ install_pre_commit: venv/bin/pre-commit install install_ansible_galaxy_modules: - venv/bin/ansible-galaxy collection install community.general \ No newline at end of file + venv/bin/ansible-galaxy collection install community.general diff --git a/ansible.cfg b/ansible.cfg.sample similarity index 59% rename from ansible.cfg rename to ansible.cfg.sample index d69e51f..d00b305 100644 --- a/ansible.cfg +++ b/ansible.cfg.sample @@ -1,3 +1,3 @@ [defaults] -remote_user = root +remote_user = REMOTE_USER inventory = datacoop_hosts diff --git a/deploy.sh b/deploy.sh index 5777829..7f9ac10 100755 --- a/deploy.sh +++ b/deploy.sh @@ -8,7 +8,7 @@ usage () { } >&2 } -BASE_CMD="ansible-playbook playbook.yml --ask-vault-pass" +BASE_CMD="ansible-playbook playbook.yml --ask-become-pass --ask-vault-pass" if [ "$1" = "--vagrant" ]; then BASE_CMD="$BASE_CMD --verbose --inventory=vagrant_host"