From 958e39bce700f01dd5bb41dad146de7466e0bcab Mon Sep 17 00:00:00 2001 From: dimti Date: Mon, 22 Jan 2024 01:24:38 +0300 Subject: [PATCH] * separate launch script by runner type concepts * do not launch sudo playbook for simple server install * use domain_name as env variable from launch script --- playbooks/root-account.yml | 9 +++-- run-lxc-playbook.sh | 2 +- run-vps-playbook.sh => run-playbook.sh | 12 ++----- run-site-playbook.sh | 63 ++++++++++++++++++++++++++++++++++ vars/nginx-example.yml | 1 - 5 files changed, 71 insertions(+), 16 deletions(-) rename run-vps-playbook.sh => run-playbook.sh (72%) create mode 100755 run-site-playbook.sh diff --git a/playbooks/root-account.yml b/playbooks/root-account.yml index ba04f3d..e7ebf91 100644 --- a/playbooks/root-account.yml +++ b/playbooks/root-account.yml @@ -1,11 +1,10 @@ --- - import_playbook: own/locales.yml - import_playbook: debops/tzdata.yml -- import_playbook: own/allow-releaseinfo-change.yml +#- import_playbook: own/allow-releaseinfo-change.yml# Need only for debian10 - import_playbook: debops/yadm.yml - import_playbook: debops/root_account.yml -- import_playbook: debops/sudo.yml +- name: Adding site_name project user to sudoers + import_playbook: debops/sudo.yml + when: 'runner != "normal"' -# Import all other group playbooks in this file... - -... diff --git a/run-lxc-playbook.sh b/run-lxc-playbook.sh index d6c3896..fdbbc92 100755 --- a/run-lxc-playbook.sh +++ b/run-lxc-playbook.sh @@ -42,7 +42,7 @@ if [[ ! -f "$PLAYBOOK" ]]; then fi COMMAND=$(cat <