mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-04-12 15:52:46 +02:00
a0cf0489d6
- schedule highstate every 2 hours (was 15 minutes); interval lives in global:push:highstate_interval_hours so the SOC admin UI can tune it and so-salt-minion-check derives its threshold as (interval + 1) * 3600 - add inotify beacon on the manager + master reactor + orch.push_batch that writes per-app intent files, with a so-push-drainer schedule on the manager that debounces, dedupes, and dispatches a single orchestration - pillar_push_map.yaml allowlists the apps whose pillar changes trigger an immediate targeted state.apply (targets verified against salt/top.sls); edits under pillar/minions/ trigger a state.highstate on that one minion - host-batch every push orchestration (batch: 25%, batch_wait: 15) so rule changes don't thundering-herd large fleets - new global:push:enabled kill-switch tears down the beacon, reactor config, and drainer schedule on the next highstate for operators who want to keep highstate-only behavior - set restart_policy: unless-stopped on 23 container states so docker recovers crashes without waiting for the next highstate; leave registry (always), strelka/backend (on-failure), kratos, and hydra alone with inline comments explaining why
97 lines
3.3 KiB
Plaintext
97 lines
3.3 KiB
Plaintext
# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
|
|
# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
|
|
# https://securityonion.net/license; you may not use this file except in compliance with the
|
|
# Elastic License 2.0.
|
|
|
|
{% from 'allowed_states.map.jinja' import allowed_states %}
|
|
{% if sls.split('.')[0] in allowed_states %}
|
|
{% from 'vars/globals.map.jinja' import GLOBALS %}
|
|
{% from 'docker/docker.map.jinja' import DOCKERMERGED %}
|
|
|
|
include:
|
|
- registry.ssl
|
|
- registry.config
|
|
- registry.sostatus
|
|
|
|
# Install the registry container
|
|
so-dockerregistry:
|
|
docker_container.running:
|
|
- image: ghcr.io/security-onion-solutions/registry:3.0.0
|
|
- hostname: so-registry
|
|
- networks:
|
|
- sobridge:
|
|
- ipv4_address: {{ DOCKERMERGED.containers['so-dockerregistry'].ip }}
|
|
# Intentionally `always` (not unless-stopped) -- registry is critical infra
|
|
# and must come back up even if it was manually stopped. Do not homogenize
|
|
# to unless-stopped; see the container auto-restart section of the plan.
|
|
- restart_policy: always
|
|
- port_bindings:
|
|
{% for BINDING in DOCKERMERGED.containers['so-dockerregistry'].port_bindings %}
|
|
- {{ BINDING }}
|
|
{% endfor %}
|
|
- binds:
|
|
- /opt/so/conf/docker-registry/etc/config.yml:/etc/distribution/config.yml:ro
|
|
- /opt/so/conf/docker-registry:/var/lib/registry:rw
|
|
- /nsm/docker-registry/docker:/var/lib/registry/docker:rw
|
|
- /etc/pki/registry.crt:/etc/pki/registry.crt:ro
|
|
- /etc/pki/registry.key:/etc/pki/registry.key:ro
|
|
{% if DOCKERMERGED.containers['so-dockerregistry'].custom_bind_mounts %}
|
|
{% for BIND in DOCKERMERGED.containers['so-dockerregistry'].custom_bind_mounts %}
|
|
- {{ BIND }}
|
|
{% endfor %}
|
|
{% endif %}
|
|
{% if DOCKERMERGED.containers['so-dockerregistry'].extra_hosts %}
|
|
- extra_hosts:
|
|
{% for XTRAHOST in DOCKERMERGED.containers['so-dockerregistry'].extra_hosts %}
|
|
- {{ XTRAHOST }}
|
|
{% endfor %}
|
|
{% endif %}
|
|
- client_timeout: 180
|
|
- environment:
|
|
- HOME=/root
|
|
{% if DOCKERMERGED.containers['so-dockerregistry'].extra_env %}
|
|
{% for XTRAENV in DOCKERMERGED.containers['so-dockerregistry'].extra_env %}
|
|
- {{ XTRAENV }}
|
|
{% endfor %}
|
|
{% endif %}
|
|
{% if DOCKERMERGED.containers['so-dockerregistry'].ulimits %}
|
|
- ulimits:
|
|
{% for ULIMIT in DOCKERMERGED.containers['so-dockerregistry'].ulimits %}
|
|
- {{ ULIMIT.name }}={{ ULIMIT.soft }}:{{ ULIMIT.hard }}
|
|
{% endfor %}
|
|
{% endif %}
|
|
- retry:
|
|
attempts: 5
|
|
interval: 30
|
|
- watch:
|
|
- x509: registry_crt
|
|
- x509: registry_key
|
|
- require:
|
|
- file: dockerregistryconf
|
|
- x509: registry_crt
|
|
- x509: registry_key
|
|
|
|
wait_for_so-dockerregistry:
|
|
http.wait_for_successful_query:
|
|
- name: 'https://{{ GLOBALS.registry_host }}:5000/v2/'
|
|
- ssl: True
|
|
- verify_ssl: False
|
|
- status: 200
|
|
- wait_for: 120
|
|
- request_interval: 5
|
|
- require:
|
|
- docker_container: so-dockerregistry
|
|
|
|
delete_so-dockerregistry_so-status.disabled:
|
|
file.uncomment:
|
|
- name: /opt/so/conf/so-status/so-status.conf
|
|
- regex: ^so-dockerregistry$
|
|
|
|
{% else %}
|
|
|
|
{{sls}}_state_not_allowed:
|
|
test.fail_without_changes:
|
|
- name: {{sls}}_state_not_allowed
|
|
|
|
{% endif %}
|