saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed issues in pre and post install for salt-master

Browse source
This commit is contained in:
David Murphy 2024-04-30 12:07:07 -06:00 • committed by Daniel Wozniak
parent 306e3ded4f
commit d3e0bf3437
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/debian/salt-master.postinst
View file

@ -1,3 +1,5 @@
#!/bin/sh -x
. /usr/share/debconf/confmodule
case "$1" in
@ -14,6 +16,8 @@ case "$1" in
fi
chown -R $RET:$RET /etc/salt/pki/master /etc/salt/master.d /var/log/salt/master /var/log/salt/key /var/cache/salt/master /var/run/salt/master
fi
if command -v systemctl; then systemctl enable salt-master; fi
if command -v systemctl; then
systemctl enable salt-master
fi
;;
esac

22
pkg/debian/salt-master.preinst
View file

@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/sh -x
. /usr/share/debconf/confmodule
@ -17,14 +17,7 @@ case "$1" in
\! \( -path /etc/salt/cloud.deploy.d\* -o -path /var/log/salt/cloud -o -path \
/opt/saltstack/salt/lib/python${PY_VER}/site-packages/salt/cloud/deploy\* \) -a \( -user ${SALT_USER} \
-o -group ${SALT_GROUP} \) -exec chown ${SALT_USER}:${SALT_GROUP} \{\} \;
;;
esac
# remove incorrectly installed ufw salt-master directory - issue 57712
test -d /etc/ufw/applications.d/salt-master && rm -rf /etc/ufw/applications.d/salt-master || /bin/true
;;
upgrade)
[ -z "$SALT_HOME" ] && SALT_HOME=/opt/saltstack/salt
@ -40,15 +33,10 @@ case "$1" in
CUR_USER = $(ls -dl /run/salt/master | cur -d ' ' -f 3)
CUR_GROUP = $(ls -dl /run/salt/master | cur -d ' ' -f 4)
db_set salt-master/user $CUR_USER
chown -R $CUR_USER:$CUR_GROUP /etc/salt/pki/master /etc/salt/master.d /var/log/salt/master \
chown -R $CUR_USER:$CUR_GROUP /etc/salt/pki/master /etc/salt/master.d /var/log/salt/master \
/var/log/salt/key /var/cache/salt/master /var/run/salt/master
fi
;;
esac
# remove incorrectly installed ufw salt-master directory - issue 57712
test -d /etc/ufw/applications.d/salt-master && rm -rf /etc/ufw/applications.d/salt-master || /bin/true
;;
esac
# remove incorrectly installed ufw salt-master directory - issue 57712
test -d /etc/ufw/applications.d/salt-master && rm -rf /etc/ufw/applications.d/salt-master || /bin/true