tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

[__pyvenv] use python3 -m venv on alpine

Browse source 
Until python4 comes, this will work
This commit is contained in:
Nico Schottelius 2020-04-02 18:24:13 +02:00
commit d034fe9369
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cdist/conf/type/__pyvenv/gencode-remote
View file

@ -37,11 +37,21 @@ mode="$(cat "$__object/parameter/mode")"
destination="/$__object_id" destination="/$__object_id"
venvparams="$(cat "$__object/parameter/venvparams")" venvparams="$(cat "$__object/parameter/venvparams")"
pyvenvparam="$__object/parameter/pyvenv" pyvenvparam="$__object/parameter/pyvenv"
os=$(cat $__global/explorer/os)
if [ -f "$pyvenvparam" ] if [ -f "$pyvenvparam" ]
then then
pyvenv=$(cat "$pyvenvparam") pyvenv=$(cat "$pyvenvparam")
else else
case "$os" in
alpine) # no pyvenv on alpine - I assume others will follow
pyvenv="python3 -m venv"
;;
*)
pyvenv="pyvenv" pyvenv="pyvenv"
;;
esac
fi fi
case $state_should in case $state_should in

1
docs/changelog
View file

@ -3,6 +3,7 @@ Changelog
next: next:
* Type __cron: Make non parallel due to race condition (Nico Schottelius) * Type __cron: Make non parallel due to race condition (Nico Schottelius)
* Type __pyvenv: Use python3 -m venv on Alpine (Nico Schottelius)
* Type __user: Fix missing shadow for alpine (llnu) * Type __user: Fix missing shadow for alpine (llnu)
* Type __consule_agent: Make conf_dir dependent on OS - fixes Alpine (Nico Schottelius) * Type __consule_agent: Make conf_dir dependent on OS - fixes Alpine (Nico Schottelius)
* Type __letsencrypt_cert: Fix typo (Andrew Schleifer) * Type __letsencrypt_cert: Fix typo (Andrew Schleifer)