Merge pull request #4584 from Security-Onion-Solutions/kilo

retry on so-dockerregistry

salt/common/tools/sbin/so-user

@@ -241,7 +241,7 @@ function syncAll() {
     staleCount=$(echo "select count(*) from identity_credentials where updated_at >= Datetime('now', '-${usersFileAgeSecs} seconds');" \
       | sqlite3 "$databasePath")
     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
   syncElastic

salt/registry/init.sls

@@ -43,6 +43,10 @@ so-dockerregistry:
       - /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
+    - timeout: 180
+    - retry:
+        attempts: 5
+        interval: 30
 
 append_so-dockerregistry_so-status.conf:
   file.append:
@@ -55,4 +59,4 @@ append_so-dockerregistry_so-status.conf:
   test.fail_without_changes:
     - name: {{sls}}_state_not_allowed
 
-{% endif %}
+{% endif %}

salt/soc/files/kratos/kratos.yaml

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