Merge pull request #59 from weslambert/master

Various updates
This commit is contained in:
Mike Reeves
2018-12-13 20:35:43 -05:00
committed by GitHub
2 changed files with 10 additions and 14 deletions

View File

@@ -1,19 +1,11 @@
# Firewall Magic for the grid
{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %}
{%- if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %}
{%- set ip = salt['pillar.get']('static:masterip', '') %}
{% elif grains['role'] == 'so-node'%}
{%- elif grains['role'] == 'so-node' %}
{%- set ip = salt['pillar.get']('node:mainip', '') %}
{% elif grains['role'] == 'so-sensor'%}
{%- set ip = salt['pillar.get']('node:mainip', '') %}
{% endif %}
{%- elif grains['role'] == 'so-sensor' %}
{%- set ip = salt['pillar.get']('sensor:mainip', '') %}
{%- endif %}
# Keep localhost in the game
iptables_allow_localhost:
iptables.append:

View File

@@ -453,7 +453,11 @@ get_filesystem_nsm(){
get_log_size_limit() {
DISK_SIZE_K=`df /nsm |grep -v "^Filesystem" | awk '{print $2}'`
DISK_DIR="/"
if [ -d /nsm ]; then
DISK_DIR="/nsm"
fi
DISK_SIZE_K=`df $DISK_DIR |grep -v "^Filesystem" | awk '{print $2}'`
PERCENTAGE=85
DISK_SIZE=DISK_SIZE_K*1000
PERCENTAGE_DISK_SPACE=`echo $(($DISK_SIZE*$PERCENTAGE/100))`