Merge pull request #162 from m0duspwnens/master

remove pip3 installing m2crypto from functions
This commit is contained in:
Mike Reeves
2019-12-12 15:10:26 -05:00
committed by GitHub

View File

@@ -573,13 +573,8 @@ install_master() {
#wget --inet4-only -O /opt/so/gpg/GPG-KEY-WAZUH https://packages.wazuh.com/key/GPG-KEY-WAZUH
else
apt-get install -y salt-common=2019.2.2+ds-1 salt-master=2019.2.2+ds-1 salt-minion=2019.2.2+ds-1
apt-get install -y salt-common=2019.2.2+ds-1 salt-master=2019.2.2+ds-1 salt-minion=2019.2.2+ds-1 libssl-dev python-m2crypto
apt-mark hold salt-common salt-master salt-minion
echo -e "XXX\n11\nInstalling libssl-dev for M2Crypto... \nXXX"
apt-get -y install libssl-dev
echo -e "XXX\n12\nUsing pip3 to install M2Crypto for Salt... \nXXX"
pip3 install M2Crypto
fi
copy_master_config