From 5d8d2475e14768b36bf9a3a5b25e45852fb9b07e Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 22 Feb 2025 13:25:28 +0900 Subject: [PATCH 1/3] Update docs/ansible.md: add a copyright header Signed-off-by: Suguru Hirahara --- docs/ansible.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/ansible.md b/docs/ansible.md index 1962c83bb..0665ed627 100644 --- a/docs/ansible.md +++ b/docs/ansible.md @@ -1,3 +1,12 @@ + # Running this playbook From edc2cab925d8831707f8e6a8c75e749175573d93 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 22 Feb 2025 13:26:33 +0900 Subject: [PATCH 2/3] Update docs/ansible.md: copy from the MASH project It was copied from https://github.com/mother-of-all-self-hosting/mash-playbook/blob/2bc4cc45d7cc5896772a092428fa501728132063/docs/ansible.md Signed-off-by: Suguru Hirahara --- docs/ansible.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/ansible.md b/docs/ansible.md index 0665ed627..7458def5b 100644 --- a/docs/ansible.md +++ b/docs/ansible.md @@ -58,7 +58,7 @@ Once you have a working Docker installation on the server, **clone the playbook* You would then need to add `ansible_connection=community.docker.nsenter` to the host line in `inventory/hosts`. This tells Ansible to connect to the "remote" machine by switching Linux namespaces with [nsenter](https://man7.org/linux/man-pages/man1/nsenter.1.html), instead of using SSH. -Alternatively, you can leave your `inventory/hosts` as is and specify the connection type in **each** `ansible-playbook` call you do later, like this: `ansible-playbook --connection=community.docker.nsenter …` +Alternatively, you can leave your `inventory/hosts` as is and specify the connection type in **each** `ansible-playbook` call you do later, like this: `just install-all --connection=community.docker.nsenter` (or `ansible-playbook --connection=community.docker.nsenter …`). Run this from the playbook's directory: @@ -76,7 +76,7 @@ Once you execute the above command, you'll be dropped into a `/work` directory i First, consider running `git config --global --add safe.directory /work` to [resolve directory ownership issues](#resolve-directory-ownership-issues). -Finally, you can execute `ansible-playbook …` (or `ansible-playbook --connection=community.docker.nsenter …`) commands as per normal now. +Finally, you can execute `just` or `ansible-playbook …` (e.g. `ansible-playbook --connection=community.docker.nsenter …`) commands as per normal now. ### Running Ansible in a container on another computer (not the Matrix server) @@ -97,7 +97,7 @@ Once you execute the above command, you'll be dropped into a `/work` directory i First, consider running `git config --global --add safe.directory /work` to [resolve directory ownership issues](#resolve-directory-ownership-issues). -Finally, you execute `ansible-playbook …` commands as per normal now. +Finally, you execute `just` or `ansible-playbook …` commands as per normal now. #### If you don't use SSH keys for authentication From 5f0b74bac2966126a68c033fbb5bebf8fcb516da Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 22 Feb 2025 13:26:42 +0900 Subject: [PATCH 3/3] Update docs/ansible.md: remove a whitespace character Signed-off-by: Suguru Hirahara --- docs/ansible.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ansible.md b/docs/ansible.md index 7458def5b..83814cc92 100644 --- a/docs/ansible.md +++ b/docs/ansible.md @@ -109,7 +109,7 @@ To authenticate at your server using a password, you need to add a package. So, apk add sshpass ``` -Then, to be asked for the password whenever running an `ansible-playbook` command add `--ask-pass` to the arguments of the command. +Then, to be asked for the password whenever running an `ansible-playbook` command add `--ask-pass` to the arguments of the command. #### Resolve directory ownership issues