Activate 18.04

This commit is contained in:
Mike Reeves
2020-03-04 13:56:49 -05:00
parent 79210a07da
commit 1bb77fb07a

View File

@@ -351,8 +351,6 @@ detect_os() {
OS=ubuntu
if grep -q "UBUNTU_CODENAME=bionic" /etc/os-release; then
OSVER=bionic
echo "We currently don't support Ubuntu $OSVER but we are working on it!"
exit
elif grep -q "UBUNTU_CODENAME=xenial" /etc/os-release; then
OSVER=xenial
else
@@ -1152,8 +1150,8 @@ salt_master_directories() {
# Copy over the salt code and templates
if [ $INSTALLMETHOD == 'iso' ]; then
cp -R /home/onion/SecurityOnion/pillar/* /opt/so/saltstack/pillar/
cp -R /home/onion/SecurityOnion/salt/* /opt/so/saltstack/salt/
rsync -avh --exclude 'TRANS.TBL' /home/onion/SecurityOnion/pillar/* /opt/so/saltstack/pillar/
rsync -avh --exclude 'TRANS.TBL' /home/onion/SecurityOnion/salt/* /opt/so/saltstack/salt/
else
cp -R $SCRIPTDIR/../pillar/* /opt/so/saltstack/pillar/
cp -R $SCRIPTDIR/../salt/* /opt/so/saltstack/salt/