Merge pull request #342 from mekanix/python-ansible

mekanix · web-flow · commit 933a128d9ab6 · 2025-06-08T19:41:24.000+02:00
Let Ansible deduce the python path
diff --git a/scripts/default.conf b/scripts/default.conf
@@ -1,4 +1,4 @@
-VERSION=0.4.1
+VERSION=0.4.2
 
 BACKEND=${BACKEND:-"base"}
 CBSD_WORKDIR=${CBSD_WORKDIR:-"/usr/cbsd"}
diff --git a/templates/ansible/inventory.local.tpl b/templates/ansible/inventory.local.tpl
@@ -1 +1 @@
-SERVICE ansible_connection=jail ansible_python_interpreter='"/usr/bin/env python"'
+SERVICE ansible_connection=jail
diff --git a/templates/ansible/inventory.remote.tpl b/templates/ansible/inventory.remote.tpl
@@ -1 +1 @@
-SERVICE ansible_ssh_user=provision ansible_ssh_private_key_file=/usr/local/share/reggae/id_rsa ansible_python_interpreter='"/usr/bin/env python"'
+SERVICE ansible_ssh_user=provision ansible_ssh_private_key_file=/usr/local/share/reggae/id_rsa

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=0.4.1`
	`1`	`+VERSION=0.4.2`
`2`	`2`
`3`	`3`	`BACKEND=${BACKEND:-"base"}`
`4`	`4`	`CBSD_WORKDIR=${CBSD_WORKDIR:-"/usr/cbsd"}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SERVICE ansible_connection=jail ansible_python_interpreter='"/usr/bin/env python"'`
	`1`	`+SERVICE ansible_connection=jail`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SERVICE ansible_ssh_user=provision ansible_ssh_private_key_file=/usr/local/share/reggae/id_rsa ansible_python_interpreter='"/usr/bin/env python"'`
	`1`	`+SERVICE ansible_ssh_user=provision ansible_ssh_private_key_file=/usr/local/share/reggae/id_rsa`