diff --git a/salt/common/init.sls b/salt/common/init.sls index c344dbb68..cf04a6b9b 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -63,6 +63,16 @@ alwaysupdated: Etc/UTC: timezone.system +# Sync some Utilities +utilsyncscripts: + file.recurse: + - name: /usr/sbin + - user: 0 + - group: 0 + - file_mode: 755 + - template: jinja + - source: salt://common/tools/sbin + # Make sure Docker is running! docker: service.running: diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval index 8f3ff4c31..5c924110c 100644 --- a/salt/common/nginx/nginx.conf.so-eval +++ b/salt/common/nginx/nginx.conf.so-eval @@ -88,6 +88,8 @@ http { # } location /grafana/ { + auth_basic "Security Onion"; + auth_basic_user_file /opt/so/conf/nginx/.htpasswd; rewrite /grafana/(.*) /$1 break; proxy_pass http://{{ masterip }}:3000/; proxy_read_timeout 90; @@ -100,6 +102,8 @@ http { } location /kibana/ { + auth_basic "Security Onion"; + auth_basic_user_file /opt/so/conf/nginx/.htpasswd; rewrite /kibana/(.*) /$1 break; proxy_pass http://{{ masterip }}:5601/; proxy_read_timeout 90; @@ -125,6 +129,8 @@ http { } location /fleet/ { + auth_basic "Security Onion"; + auth_basic_user_file /opt/so/conf/nginx/.htpasswd; rewrite /fleet/(.*) /$1 break; proxy_pass https://{{ masterip }}:8080/; proxy_read_timeout 90; @@ -137,6 +143,8 @@ http { } location /thehive/ { + auth_basic "Security Onion"; + auth_basic_user_file /opt/so/conf/nginx/.htpasswd; proxy_pass http://{{ masterip }}:9000/thehive/; proxy_read_timeout 90; proxy_connect_timeout 90; @@ -159,6 +167,8 @@ http { } location /sensoroni/ { + auth_basic "Security Onion"; + auth_basic_user_file /opt/so/conf/nginx/.htpasswd; proxy_pass http://{{ masterip }}:9822/; proxy_read_timeout 90; proxy_connect_timeout 90; diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master index 6e512b191..7f922d72a 100644 --- a/salt/common/nginx/nginx.conf.so-master +++ b/salt/common/nginx/nginx.conf.so-master @@ -88,7 +88,7 @@ http { # } location /grafana/ { - auth_basic “Security Onion”; + auth_basic "Security Onion"; auth_basic_user_file /opt/so/conf/nginx/.htpasswd; rewrite /grafana/(.*) /$1 break; proxy_pass http://{{ masterip }}:3000/; @@ -102,7 +102,7 @@ http { } location /kibana/ { - auth_basic “Security Onion”; + auth_basic "Security Onion"; auth_basic_user_file /opt/so/conf/nginx/.htpasswd; rewrite /kibana/(.*) /$1 break; proxy_pass http://{{ masterip }}:5601/; @@ -130,7 +130,7 @@ http { location /fleet/ { rewrite /fleet/(.*) /$1 break; - auth_basic “Security Onion”; + auth_basic "Security Onion"; auth_basic_user_file /opt/so/conf/nginx/.htpasswd; proxy_pass https://{{ masterip }}:8080/; proxy_read_timeout 90; @@ -143,7 +143,7 @@ http { } location /thehive/ { - auth_basic “Security Onion”; + auth_basic "Security Onion"; auth_basic_user_file /opt/so/conf/nginx/.htpasswd; proxy_pass http://{{ masterip }}:9000/thehive/; proxy_read_timeout 90; @@ -168,7 +168,7 @@ http { } location /sensoroni/ { - auth_basic “Security Onion”; + auth_basic "Security Onion"; auth_basic_user_file /opt/so/conf/nginx/.htpasswd; proxy_pass http://{{ masterip }}:9822/; proxy_read_timeout 90;