CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-ordered wazuh setup to avoid agent-service failures due to missing client.keys file; Prepare for user profile settings screen support in reverse proxy

Browse Source
This commit is contained in:
Jason Ertel
2020-06-02 17:31:43 -04:00
parent 014274930a
commit e6fcf75181
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/nginx/etc/nginx.conf.so-eval
View File

@@ -134,7 +134,7 @@ http {
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
} }
location ~ ^/auth/.*?(whoami|login|logout) { location ~ ^/auth/.*?(whoami|login|logout|settings) {
rewrite /auth/(.*) /$1 break; rewrite /auth/(.*) /$1 break;
proxy_pass http://{{ masterip }}:4433; proxy_pass http://{{ masterip }}:4433;
proxy_read_timeout 90; proxy_read_timeout 90;

2
salt/nginx/etc/nginx.conf.so-master
View File

@@ -134,7 +134,7 @@ http {
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
} }
location ~ ^/auth/.*?(whoami|login|logout) { location ~ ^/auth/.*?(whoami|login|logout|settings) {
rewrite /auth/(.*) /$1 break; rewrite /auth/(.*) /$1 break;
proxy_pass http://{{ masterip }}:4433; proxy_pass http://{{ masterip }}:4433;
proxy_read_timeout 90; proxy_read_timeout 90;

2
salt/nginx/etc/nginx.conf.so-mastersearch
View File

@@ -134,7 +134,7 @@ http {
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
} }
location ~ ^/auth/.*?(whoami|login|logout) { location ~ ^/auth/.*?(whoami|login|logout|settings) {
rewrite /auth/(.*) /$1 break; rewrite /auth/(.*) /$1 break;
proxy_pass http://{{ masterip }}:4433; proxy_pass http://{{ masterip }}:4433;
proxy_read_timeout 90; proxy_read_timeout 90;

2
salt/soc/files/kratos/kratos.yaml
View File

@@ -42,7 +42,7 @@ urls:
login_ui: https://{{ WEBACCESS }}/login/ login_ui: https://{{ WEBACCESS }}/login/
registration_ui: https://{{ WEBACCESS }}/login/ registration_ui: https://{{ WEBACCESS }}/login/
error_ui: https://{{ WEBACCESS }}/login/ error_ui: https://{{ WEBACCESS }}/login/
settings_ui: https://{{ WEBACCESS }}/ settings_ui: https://{{ WEBACCESS }}/?r=/settings
verify_ui: https://{{ WEBACCESS }}/ verify_ui: https://{{ WEBACCESS }}/
mfa_ui: https://{{ WEBACCESS }}/ mfa_ui: https://{{ WEBACCESS }}/

10
salt/wazuh/init.sls
View File

@@ -80,11 +80,6 @@ wazuhmgrwhitelist:
- mode: 755 - mode: 755
- template: jinja - template: jinja
wazuhagentservice:
service.running:
- name: wazuh-agent
- enable: True
so-wazuh: so-wazuh:
docker_container.running: docker_container.running:
- image: {{ MASTER }}:5000/soshybridhunter/so-wazuh:{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-wazuh:{{ VERSION }}
@@ -110,3 +105,8 @@ whitelistmanager:
cmd.run: cmd.run:
- name: /usr/sbin/wazuh-manager-whitelist - name: /usr/sbin/wazuh-manager-whitelist
- cwd: / - cwd: /
wazuhagentservice:
service.running:
- name: wazuh-agent
- enable: True