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

changes for backup state

Browse Source
This commit is contained in:
m0duspwnens
2022-10-12 11:31:42 -04:00
parent b526532ab6
commit 6a17f201a2
8 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pillar/top.sls
View File

@@ -43,6 +43,8 @@ base:
- manager.adv_manager - manager.adv_manager
- soc.soc_soc - soc.soc_soc
- soc.adv_soc - soc.adv_soc
- backup.soc_backup
- backup.adv_backup
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -67,6 +69,8 @@ base:
- elasticsearch.soc_elasticsearch - elasticsearch.soc_elasticsearch
- manager.soc_manager - manager.soc_manager
- soc.soc_soc - soc.soc_soc
- backup.soc_backup
- backup.adv_backup
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -89,6 +93,8 @@ base:
- elasticsearch.soc_elasticsearch - elasticsearch.soc_elasticsearch
- manager.soc_manager - manager.soc_manager
- soc.soc_soc - soc.soc_soc
- backup.soc_backup
- backup.adv_backup
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -140,6 +146,8 @@ base:
- soc_global - soc_global
- adv_global - adv_global
- manager.soc_manager - manager.soc_manager
- backup.soc_backup
- backup.adv_backup
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}

2
salt/backup/config_backup.sls
View File

@@ -16,7 +16,7 @@ config_backup_script:
- group: root - group: root
- file_mode: 755 - file_mode: 755
- template: jinja - template: jinja
- source: salt://backup/tools/sbin - source: salt://backup/tools/sbin/so-config-backup.jinja
- defaults: - defaults:
BACKUPLOCATIONS: {{ BACKUP_MERGED.locations }} BACKUPLOCATIONS: {{ BACKUP_MERGED.locations }}

3
salt/backup/defaults.yaml
View File

@@ -1,3 +1,6 @@
backup: backup:
locations: locations:
- /opt/so/saltstack/local - /opt/so/saltstack/local
- /etc/pki
- /etc/salt
- /opt/so/conf/kratos

2
salt/backup/map.jinja
View File

@@ -1,2 +1,2 @@
{% import_yaml 'backup/defaults.yaml' as BACKUP_DEFAULTS %} {% import_yaml 'backup/defaults.yaml' as BACKUP_DEFAULTS %}
{% set BACKUP_MERGED = salt['pillar.get']('backup', BACKUP_DEFAULTS, merge=true, merge_nested_lists=true) %} {% set BACKUP_MERGED = salt['pillar.get']('backup', BACKUP_DEFAULTS.backup, merge=true, merge_nested_lists=true) %}

3
salt/backup/tools/sbin/so-config-backup → salt/backup/tools/sbin/so-config-backup.jinja
View File

@@ -24,9 +24,6 @@ if [ ! -f $BACKUPFILE ]; then
{%- for LOCATION in BACKUPLOCATIONS %} {%- for LOCATION in BACKUPLOCATIONS %}
tar -rf $BACKUPFILE {{ LOCATION }} tar -rf $BACKUPFILE {{ LOCATION }}
{%- endfor %} {%- endfor %}
tar -rf $BACKUPFILE /etc/pki
tar -rf $BACKUPFILE /etc/salt
tar -rf $BACKUPFILE /opt/so/conf/kratos
fi fi

2
salt/kibana/config.map.jinja
View File

@@ -3,7 +3,7 @@
{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %} {% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
{% do KIBANACONFIG.kibana.config.server.update({'publicBaseUrl': 'https://' ~ GLOBALS.url_base ~ '/kibana'}) %} {% do KIBANACONFIG.kibana.config.server.update({'publicBaseUrl': 'https://' ~ GLOBALS.url_base ~ '/kibana'}) %}
{% do KIBANACONFIG.kibana.config.elasticsearch.update({'hosts': ['https://' ~ GLOBALS..manager_ip ~ ':9200']}) %} {% do KIBANACONFIG.kibana.config.elasticsearch.update({'hosts': ['https://' ~ GLOBALS.manager_ip ~ ':9200']}) %}
{% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass')}) %} {% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass')}) %}

2
salt/logstash/map.jinja
View File

@@ -10,5 +10,5 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
{% do REDIS_NODES.append({GLOBALS.node_ip}) %} {% do REDIS_NODES.append({GLOBALS.hostname:GLOBALS.node_ip}) %}
{% endif %} {% endif %}

2
salt/vars/globals.map.jinja
View File

@@ -33,7 +33,7 @@
'so-manager', 'so-manager',
'so-managersearch', 'so-managersearch',
'so-standalone' 'so-standalone'
] ],
'sensor_roles': [ 'sensor_roles': [
'so-eval', 'so-eval',
'so-heavynode', 'so-heavynode',