Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
quassel-docker
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
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Janne Mareike Koschinski
quassel-docker
Commits
4ea89136
Verified
Commit
4ea89136
authored
4 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Allow specifying tls keypair as base64 env variables
parent
f5251d0a
Branches
ui-rewrite
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+4
-0
4 additions, 0 deletions
Dockerfile
src/docker-entrypoint.sh
+17
-3
17 additions, 3 deletions
src/docker-entrypoint.sh
with
21 additions
and
3 deletions
Dockerfile
+
4
−
0
View file @
4ea89136
...
...
@@ -123,8 +123,12 @@ ENV OIDENTD_CONF_FILE=""
# Require SSL for remote (non-loopback) client connections.
ENV
SSL_REQUIRED="false"
# Specify the base64 encoded data for the SSL certificate.
ENV
SSL_CERT_DATA=""
# Specify the path to the SSL certificate.
ENV
SSL_CERT_FILE=""
# Specify the base64 encoded data for the SSL certificate.
ENV
SSL_KEY_DATA=""
# Specify the path to the SSL key.
ENV
SSL_KEY_FILE=""
...
...
This diff is collapsed.
Click to expand it.
src/docker-entrypoint.sh
+
17
−
3
View file @
4ea89136
...
...
@@ -6,7 +6,7 @@ declare -a quasselcore_args
quasselcore_args+
=(
--configdir
"
${
CONFIG_DIR
}
"
)
# The address(es) quasselcore will listen on.
# format: <address>[,<address>[,...]]
if
[[
"
${
QUASSEL_PORT
}
"
!=
"4242"
]]
;
then
...
...
@@ -14,7 +14,7 @@ if [[ "${QUASSEL_PORT}" != "4242" ]]; then
--port
"
${
QUASSEL_PORT
}
"
)
fi
# The port quasselcore will listen at.
# format: port
if
[[
"
${
QUASSEL_LISTEN
}
"
!=
"::,0.0.0.0"
]]
;
then
...
...
@@ -58,7 +58,7 @@ if [[ "${IDENT_LISTEN}" != "::1,127.0.0.1" ]]; then
--ident-listen
"
${
IDENT_LISTEN
}
"
)
fi
# The port quasselcore will listen at for ident requests. Only meaningful with --ident-daemon.
# format: port
if
[[
"
${
IDENT_PORT
}
"
!=
"10113"
]]
;
then
...
...
@@ -89,6 +89,13 @@ if [[ "${SSL_REQUIRED}" == "true" ]]; then
)
fi
# Specify the path to the SSL certificate.
# format: base64 data
if
[[
!
-z
"
${
SSL_CERT_DATA
}
"
]]
;
then
echo
"
${
SSL_CERT_DATA
}
"
|
base64
-d
>
/tls.crt
export
SSL_CERT_FILE
=
/tls.crt
fi
# Specify the path to the SSL certificate.
# format: path
if
[[
!
-z
"
${
SSL_CERT_FILE
}
"
]]
;
then
...
...
@@ -97,6 +104,13 @@ if [[ ! -z "${SSL_CERT_FILE}" ]]; then
)
fi
# Specify the path to the SSL certificate.
# format: base64 data
if
[[
!
-z
"
${
SSL_KEY_DATA
}
"
]]
;
then
echo
"
${
SSL_KEY_DATA
}
"
|
base64
-d
>
/tls.key
export
SSL_KEY_FILE
=
/tls.key
fi
# Specify the path to the SSL key.
# format: path
if
[[
!
-z
"
${
SSL_KEY_FILE
}
"
]]
;
then
...
...
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