diff --git a/pkg/debian/rules b/pkg/debian/rules index 6ed990418e4d..26d0112a5e5f 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -4,7 +4,7 @@ DH_VERBOSE = 1 .PHONY: override_dh_strip %: - dh $@ + dh $@ --with python3,bash-completion --with=systemd # dh_auto_clean tries to invoke distutils causing failures. override_dh_auto_clean: diff --git a/pkg/debian/salt-api.postinst b/pkg/debian/salt-api.postinst index 3b78211922ad..fecd7e5d336f 100644 --- a/pkg/debian/salt-api.postinst +++ b/pkg/debian/salt-api.postinst @@ -12,26 +12,26 @@ case "$1" in fi chown $RET:$RET /var/log/salt/api fi - if command -v systemctl; then - db_get salt-api/active - RESLT=$(echo "$RET" | cut -d ' ' -f 1) - if [ "$RESLT" != 10 ]; then - systemctl daemon-reload - if [ "$RESLT" = "active" ]; then - systemctl restart salt-api - fi - db_get salt-api/enabled - RESLT=$(echo "$RET" | cut -d ' ' -f 1) - if [ "$RESLT" = "disabled" ]; then - systemctl disable salt-api - else - systemctl enable salt-api - fi - else - systemctl daemon-reload - systemctl restart salt-api - systemctl enable salt-api - fi - fi + ## DGM if command -v systemctl; then + ## DGM db_get salt-api/active + ## DGM RESLT=$(echo "$RET" | cut -d ' ' -f 1) + ## DGM if [ "$RESLT" != 10 ]; then + ## DGM systemctl daemon-reload + ## DGM if [ "$RESLT" = "active" ]; then + ## DGM systemctl restart salt-api + ## DGM fi + ## DGM db_get salt-api/enabled + ## DGM RESLT=$(echo "$RET" | cut -d ' ' -f 1) + ## DGM if [ "$RESLT" = "disabled" ]; then + ## DGM systemctl disable salt-api + ## DGM else + ## DGM systemctl enable salt-api + ## DGM fi + ## DGM else + ## DGM systemctl daemon-reload + ## DGM systemctl restart salt-api + ## DGM systemctl enable salt-api + ## DGM fi + ## DGM fi ;; esac diff --git a/pkg/debian/salt-api.preinst b/pkg/debian/salt-api.preinst index ddc7c9e0ec7b..60de76d39b91 100644 --- a/pkg/debian/salt-api.preinst +++ b/pkg/debian/salt-api.preinst @@ -14,15 +14,15 @@ case "$1" in CUR_GROUP=$(ls -dl /run/salt-api.pid | cut -d ' ' -f 4) db_set salt-api/user $CUR_USER chown -R $CUR_USER:$CUR_GROUP /var/log/salt/api - if command -v systemctl; then - SM_ENABLED=$(systemctl show -p UnitFileState salt-api | cut -d '=' -f 2) - db_set salt-api/enabled $SM_ENABLED - SM_ACTIVE=$(systemctl is-active salt-api) - db_set salt-api/active $SM_ACTIVE - else - db_set salt-api/enabled enabled - db_set salt-api/active active + ## DGM if command -v systemctl; then + ## DGM SM_ENABLED=$(systemctl show -p UnitFileState salt-api | cut -d '=' -f 2) + ## DGM db_set salt-api/enabled $SM_ENABLED + ## DGM SM_ACTIVE=$(systemctl is-active salt-api) + ## DGM db_set salt-api/active $SM_ACTIVE + ## DGM else + ## DGM db_set salt-api/enabled enabled + ## DGM db_set salt-api/active active - fi + ## DGM fi ;; esac diff --git a/pkg/debian/salt-master.postinst b/pkg/debian/salt-master.postinst index be7064f9bad2..2b1b003a2761 100644 --- a/pkg/debian/salt-master.postinst +++ b/pkg/debian/salt-master.postinst @@ -16,26 +16,26 @@ 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 - db_get salt-master/active - RESLT=$(echo "$RET" | cut -d ' ' -f 1) - if [ "$RESLT" != 10 ]; then - systemctl daemon-reload - if [ "$RESLT" = "active" ]; then - systemctl restart salt-master - fi - db_get salt-master/enabled - RESLT=$(echo "$RET" | cut -d ' ' -f 1) - if [ "$RESLT" = "disabled" ]; then - systemctl disable salt-master - else - systemctl enable salt-master - fi - else - systemctl daemon-reload - systemctl restart salt-master - systemctl enable salt-master - fi - fi + ## DGM if command -v systemctl; then + ## DGM db_get salt-master/active + ## DGM RESLT=$(echo "$RET" | cut -d ' ' -f 1) + ## DGM if [ "$RESLT" != 10 ]; then + ## DGM systemctl daemon-reload + ## DGM if [ "$RESLT" = "active" ]; then + ## DGM systemctl restart salt-master + ## DGM fi + ## DGM db_get salt-master/enabled + ## DGM RESLT=$(echo "$RET" | cut -d ' ' -f 1) + ## DGM if [ "$RESLT" = "disabled" ]; then + ## DGM systemctl disable salt-master + ## DGM else + ## DGM systemctl enable salt-master + ## DGM fi + ## DGM else + ## DGM systemctl daemon-reload + ## DGM systemctl restart salt-master + ## DGM systemctl enable salt-master + ## DGM fi + ## DGM fi ;; esac diff --git a/pkg/debian/salt-master.preinst b/pkg/debian/salt-master.preinst index af978b8e508e..ef1a5dcf10cd 100644 --- a/pkg/debian/salt-master.preinst +++ b/pkg/debian/salt-master.preinst @@ -31,16 +31,16 @@ case "$1" in 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 \ /var/log/salt/key /var/cache/salt/master /var/run/salt/master - if command -v systemctl; then - SM_ENABLED=$(systemctl show -p UnitFileState salt-master | cut -d '=' -f 2) - db_set salt-master/enabled $SM_ENABLED - SM_ACTIVE=$(systemctl is-active salt-master) - db_set salt-master/active $SM_ACTIVE - else - db_set salt-master/enabled enabled - db_set salt-master/active active - - fi + ## DGM if command -v systemctl; then + ## DGM SM_ENABLED=$(systemctl show -p UnitFileState salt-master | cut -d '=' -f 2) + ## DGM db_set salt-master/enabled $SM_ENABLED + ## DGM SM_ACTIVE=$(systemctl is-active salt-master) + ## DGM db_set salt-master/active $SM_ACTIVE + ## DGM else + ## DGM db_set salt-master/enabled enabled + ## DGM db_set salt-master/active active + + ## DGM fi ;; esac diff --git a/pkg/debian/salt-minion.postinst b/pkg/debian/salt-minion.postinst index 13d1cf509016..bd2e90b1b69a 100644 --- a/pkg/debian/salt-minion.postinst +++ b/pkg/debian/salt-minion.postinst @@ -16,26 +16,26 @@ case "$1" in fi chown -R $RET:$RET /etc/salt/pki/minion /etc/salt/minion.d /var/log/salt/minion /var/cache/salt/minion /var/run/salt/minion fi - if command -v systemctl; then - db_get salt-minion/active - RESLT=$(echo "$RET" | cut -d ' ' -f 1) - if [ "$RESLT" != 10 ]; then - systemctl daemon-reload - if [ "$RESLT" = "active" ]; then - systemctl restart salt-minion - fi - db_get salt-minion/enabled - RESLT=$(echo "$RET" | cut -d ' ' -f 1) - if [ "$RESLT" = "disabled" ]; then - systemctl disable salt-minion - else - systemctl enable salt-minion - fi - else - systemctl daemon-reload - systemctl restart salt-minion - systemctl enable salt-minion - fi - fi + ## DGM if command -v systemctl; then + ## DGM db_get salt-minion/active + ## DGM RESLT=$(echo "$RET" | cut -d ' ' -f 1) + ## DGM if [ "$RESLT" != 10 ]; then + ## DGM systemctl daemon-reload + ## DGM if [ "$RESLT" = "active" ]; then + ## DGM systemctl restart salt-minion + ## DGM fi + ## DGM db_get salt-minion/enabled + ## DGM RESLT=$(echo "$RET" | cut -d ' ' -f 1) + ## DGM if [ "$RESLT" = "disabled" ]; then + ## DGM systemctl disable salt-minion + ## DGM else + ## DGM systemctl enable salt-minion + ## DGM fi + ## DGM else + ## DGM systemctl daemon-reload + ## DGM systemctl restart salt-minion + ## DGM systemctl enable salt-minion + ## DGM fi + ## DGM fi ;; esac diff --git a/pkg/debian/salt-minion.preinst b/pkg/debian/salt-minion.preinst index 4a4cd949c642..3538a6df740b 100644 --- a/pkg/debian/salt-minion.preinst +++ b/pkg/debian/salt-minion.preinst @@ -16,15 +16,15 @@ case "$1" in db_set salt-minion/user $CUR_USER chown -R $CUR_USER:$CUR_GROUP /etc/salt/pki/minion /etc/salt/minion.d /var/log/salt/minion \ /var/cache/salt/minion /var/run/salt/minion - if command -v systemctl; then - SM_ENABLED=$(systemctl show -p UnitFileState salt-minion | cut -d '=' -f 2) - db_set salt-minion/enabled $SM_ENABLED - SM_ACTIVE=$(systemctl is-active salt-minion) - db_set salt-minion/active $SM_ACTIVE - else - db_set salt-minion/enabled enabled - db_set salt-minion/active active + ## DGM if command -v systemctl; then + ## DGM SM_ENABLED=$(systemctl show -p UnitFileState salt-minion | cut -d '=' -f 2) + ## DGM db_set salt-minion/enabled $SM_ENABLED + ## DGM SM_ACTIVE=$(systemctl is-active salt-minion) + ## DGM db_set salt-minion/active $SM_ACTIVE + ## DGM else + ## DGM db_set salt-minion/enabled enabled + ## DGM db_set salt-minion/active active - fi + ## DGM fi ;; esac