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

Merge branch 'kilo' of https://github.com/Security-Onion-Solutions/securityonion into kilo

Browse Source
This commit is contained in:
m0duspwnens
2021-06-22 08:23:26 -04:00
parent bc86590411 8ddc99e91f
commit 9cdbcb72ac
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/common/tools/sbin/so-user
View File

@@ -241,7 +241,7 @@ function syncAll() {
staleCount=$(echo "select count(*) from identity_credentials where updated_at >= Datetime('now', '-${usersFileAgeSecs} seconds');" \ staleCount=$(echo "select count(*) from identity_credentials where updated_at >= Datetime('now', '-${usersFileAgeSecs} seconds');" \
| sqlite3 "$databasePath") | sqlite3 "$databasePath")
if [[ "$staleCount" == "0" ]]; then if [[ "$staleCount" == "0" ]]; then
fail "Users are already in sync. Run 'FORCE_SYNC=1 $0 sync' to force a full sync anyway." return 1
fi fi
fi fi
syncElastic syncElastic

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

@@ -1,5 +1,9 @@
{%- set WEBACCESS = salt['pillar.get']('global:url_base', '') -%} {%- set WEBACCESS = salt['pillar.get']('global:url_base', '') -%}
{%- set KRATOSKEY = salt['pillar.get']('kratos:kratoskey', '') -%} {%- set KRATOSKEY = salt['pillar.get']('kratos:kratoskey', '') -%}
{%- set SESSIONTIMEOUT = salt['pillar.get']('kratos:sessiontimeout', '24h') -%}
session:
lifespan: {{ SESSIONTIMEOUT }}
selfservice: selfservice:
methods: methods: