Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
soctools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gn4-3-wp8-t3.1 SOC
soctools
Commits
224d422a
Commit
224d422a
authored
4 years ago
by
Arne Øslebø
Browse files
Options
Downloads
Patches
Plain Diff
small fix for misp integration
parent
f8af65dc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
group_vars/all/main.yml
+2
-2
2 additions, 2 deletions
group_vars/all/main.yml
roles/build/templates/misp/Dockerfile.j2
+2
-2
2 additions, 2 deletions
roles/build/templates/misp/Dockerfile.j2
with
4 additions
and
4 deletions
group_vars/all/main.yml
+
2
−
2
View file @
224d422a
...
...
@@ -106,7 +106,7 @@ odfeplugin_version: "1.4.0.0"
openid_realm
:
"
SOCTOOLS1"
openid_scope
:
profile
openid_subjkey
:
email
openid_subjkey
:
preferred_username
keycloak_img
:
"
{{repo}}/keycloak:{{version}}{{suffix}}"
keycloak_adminpass
:
"
Pass005"
...
...
@@ -122,4 +122,4 @@ misp_dbpass: "Pass007"
# misp_salt generated with: openssl rand -base64 32
misp_salt
:
"
wa2fJA2mGIn32IDl+uKrCJ069Mg3khDdGzFNv8DOwM0="
misp_odic_crypto_pass
:
1234567890
#TODO: Generate dynamically
misp_crypto_pass
:
1234567890
#TODO: Generate dynamically
\ No newline at end of file
misp_crypto_pass
:
1234567890
#TODO: Generate dynamically
This diff is collapsed.
Click to expand it.
roles/build/templates/misp/Dockerfile.j2
+
2
−
2
View file @
224d422a
...
...
@@ -84,5 +84,5 @@ EXPOSE 80 443 6443 6379 6666 50000
ENV PATH "$PATH:/opt/rh/rh-php72/root/bin/"
COPY mispsupervisord.conf /etc/supervisord.conf
#
ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
ENTRYPOINT ["/bin/bash"]
ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
#
ENTRYPOINT ["/bin/bash"]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment