From fb93943ba5ac6d4b5ccd75b26489b5f8619fcf10 Mon Sep 17 00:00:00 2001
From: dimti <demidov@dimti.ru>
Date: Fri, 22 Mar 2024 18:47:05 +0300
Subject: [PATCH] + yadm initialization for non priveleged and existing users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#861m7vaer Шаблон операционной системы на Debian 10
---
 .../{nginx-site-without-db.yml => nginx-without-db-site.yml}      | 0
 playbooks/own/yadm.yml                                            | 6 ++++++
 playbooks/yadm.yml                                                | 2 ++
 run-lxc-playbook.sh                                               | 2 +-
 run-playbook.sh                                                   | 8 ++++++--
 run-site-playbook.sh                                              | 6 ++++++
 yadm.yml                                                          | 8 --------
 7 files changed, 21 insertions(+), 11 deletions(-)
 rename playbooks/{nginx-site-without-db.yml => nginx-without-db-site.yml} (100%)
 create mode 100644 playbooks/own/yadm.yml
 create mode 100644 playbooks/yadm.yml
 delete mode 100644 yadm.yml

diff --git a/playbooks/nginx-site-without-db.yml b/playbooks/nginx-without-db-site.yml
similarity index 100%
rename from playbooks/nginx-site-without-db.yml
rename to playbooks/nginx-without-db-site.yml
diff --git a/playbooks/own/yadm.yml b/playbooks/own/yadm.yml
new file mode 100644
index 0000000..695c30a
--- /dev/null
+++ b/playbooks/own/yadm.yml
@@ -0,0 +1,6 @@
+---
+- hosts: [ 'debian10' ]
+  tasks:
+    - name: Clone dotfiles repo
+      shell: yadm clone --bootstrap https://vcs.wpstudio.ru/gitea/dotfiles.git
+#      TODO: убрать sudo для автовключения тмукса из .bashrc
diff --git a/playbooks/yadm.yml b/playbooks/yadm.yml
new file mode 100644
index 0000000..670ab3c
--- /dev/null
+++ b/playbooks/yadm.yml
@@ -0,0 +1,2 @@
+---
+- import_playbook: own/yadm.yml
diff --git a/run-lxc-playbook.sh b/run-lxc-playbook.sh
index fdbbc92..b43cfb9 100755
--- a/run-lxc-playbook.sh
+++ b/run-lxc-playbook.sh
@@ -42,7 +42,7 @@ if [[ ! -f "$PLAYBOOK" ]]; then
 fi
 
 COMMAND=$(cat <<EOF
-ansible-playbook -e "lxc_host=$LXC_HOST" -e runner=lxc --ssh-common-args="-o ProxyCommand='ssh -W %h:%p -q root@$SERVER'" $PLAYBOOK
+ansible-playbook -e "lxc_host=$LXC_HOST" -e="domain_name=$LXC_HOST" -e runner=lxc --ssh-common-args="-o ProxyCommand='ssh -W %h:%p -q root@$SERVER'" $PLAYBOOK
 EOF
 )
 
diff --git a/run-playbook.sh b/run-playbook.sh
index ece738e..61413b3 100755
--- a/run-playbook.sh
+++ b/run-playbook.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 SERVER=$1
 PLAYBOOK=$2
-SITE_NAME=$3
+USER=$3
 
 while [[ "$#" -gt 0 ]]; do
     case $1 in
@@ -28,8 +28,12 @@ if [[ -z "$PLAYBOOK" ]]; then
   exit 1
 fi
 
+if [[ -z "$USER" ]]; then
+    USER=root
+fi
+
 COMMAND=$(cat <<EOF
-ansible-playbook -e "lxc_host=${SERVER} -e runner=normal"
+ansible-playbook -e "lxc_host=${SERVER}" -e "runner=normal" -e "ansible_user=${USER}"
 EOF
 )
 
diff --git a/run-site-playbook.sh b/run-site-playbook.sh
index a295e99..d3d8e91 100755
--- a/run-site-playbook.sh
+++ b/run-site-playbook.sh
@@ -43,6 +43,12 @@ if [[ -z "$DOMAIN_NAME" ]]; then
   exit 1
 fi
 
+if [[ ! -f "$PLAYBOOK" ]]; then
+  echo "Playbook file is not exists: $PLAYBOOK"
+  usage
+  exit 1
+fi
+
 COMMAND=$(cat <<EOF
 ansible-playbook -e "lxc_host=${SERVER}" -e "initial_site_name=${SITE_NAME}" -e "domain_name=${DOMAIN_NAME}" -e runner=site
 EOF
diff --git a/yadm.yml b/yadm.yml
deleted file mode 100644
index baf8e00..0000000
--- a/yadm.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- import_playbook: debops/yadm.yml
-- import_playbook: debops/users.yml
-- import_playbook: debops/sudo.yml
-
-# Import all other group playbooks in this file...
-
-...