Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
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
Timo Ley
synapse
Commits
f2bf0cda
Commit
f2bf0cda
authored
7 years ago
by
kaiyou
Browse files
Options
Downloads
Patches
Plain Diff
Generate shared secrets if not defined in the environment
parent
6d1e28a8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/docker/start.py
+11
-4
11 additions, 4 deletions
contrib/docker/start.py
with
11 additions
and
4 deletions
contrib/docker/start.py
+
11
−
4
View file @
f2bf0cda
...
...
@@ -5,10 +5,11 @@ import os
import
sys
import
subprocess
convert
=
lambda
src
,
dst
:
open
(
dst
,
"
w
"
).
write
(
jinja2
.
Template
(
open
(
src
).
read
()).
render
(
**
os
.
environ
))
convert
=
lambda
src
,
dst
,
environ
:
open
(
dst
,
"
w
"
).
write
(
jinja2
.
Template
(
open
(
src
).
read
()).
render
(
**
environ
))
mode
=
sys
.
argv
[
1
]
if
len
(
sys
.
argv
)
>
1
else
None
environ
=
os
.
environ
.
copy
()
if
"
SYNAPSE_SERVER_NAME
"
not
in
os
.
environ
:
if
"
SYNAPSE_SERVER_NAME
"
not
in
environ
:
print
(
"
Environment variable SYNAPSE_SERVER_NAME is mandatory, exiting.
"
)
sys
.
exit
(
2
)
...
...
@@ -17,10 +18,16 @@ args = ["python", "-m", "synapse.app.homeserver",
"
--report-stats
"
,
os
.
environ
.
get
(
"
SYNAPSE_REPORT_STATS
"
,
"
no
"
),
"
--config-path
"
,
os
.
environ
.
get
(
"
SYNAPSE_CONFIG_PATH
"
,
"
/compiled/homeserver.yaml
"
)]
# Generate any missing shared secret
for
secret
in
(
"
SYNAPSE_REGISTRATION_SHARED_SECRET
"
,
"
SYNAPSE_MACAROON_SECRET_KEY
"
):
if
secret
not
in
environ
:
print
(
"
Generating a random secret for {}
"
.
format
(
secret
))
environ
[
secret
]
=
os
.
urandom
(
32
).
encode
(
"
hex
"
)
# Parse the configuration file
if
not
os
.
path
.
exists
(
"
/compiled
"
):
os
.
mkdir
(
"
/compiled
"
)
convert
(
"
/conf/homeserver.yaml
"
,
"
/compiled/homeserver.yaml
"
)
convert
(
"
/conf/log.config
"
,
"
/compiled/%s.log.config
"
%
os
.
environ
.
get
(
"
SYNAPSE_SERVER_NAME
"
))
convert
(
"
/conf/homeserver.yaml
"
,
"
/compiled/homeserver.yaml
"
,
environ
)
convert
(
"
/conf/log.config
"
,
"
/compiled/%s.log.config
"
%
environ
.
get
(
"
SYNAPSE_SERVER_NAME
"
)
,
environ
)
# In generate mode, generate a configuration, missing keys, then exit
if
mode
==
"
generate
"
:
...
...
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