Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
e7611598
Commit
e7611598
authored
Jun 21, 2019
by
rinpatch
Browse files
Move config templates to priv so they can be found in releases
parent
2437f512
Pipeline
#13622
passed with stages
in 7 minutes and 26 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/mix/tasks/pleroma/instance.ex
View file @
e7611598
...
...
@@ -155,10 +155,11 @@ def run(["gen" | rest]) do
secret
=
:crypto
.
strong_rand_bytes
(
64
)
|>
Base
.
encode64
()
|>
binary_part
(
0
,
64
)
signing_salt
=
:crypto
.
strong_rand_bytes
(
8
)
|>
Base
.
encode64
()
|>
binary_part
(
0
,
8
)
{
web_push_public_key
,
web_push_private_key
}
=
:crypto
.
generate_key
(
:ecdh
,
:prime256v1
)
template_dir
=
Application
.
app_dir
(
:pleroma
,
"priv"
)
<>
"/templates"
result_config
=
EEx
.
eval_file
(
"sample_config.eex"
|>
Path
.
expand
(
__DIR__
)
,
template_dir
<>
"/sample_config.eex"
,
domain:
domain
,
port:
port
,
email:
email
,
...
...
@@ -179,7 +180,7 @@ def run(["gen" | rest]) do
result_psql
=
EEx
.
eval_file
(
"sample_psql.eex"
|>
Path
.
expand
(
__DIR__
)
,
template_dir
<>
"/sample_psql.eex"
,
dbname:
dbname
,
dbuser:
dbuser
,
dbpass:
dbpass
...
...
@@ -193,7 +194,7 @@ def run(["gen" | rest]) do
shell_info
(
"Writing
#{
psql_path
}
."
)
File
.
write
(
psql_path
,
result_psql
)
write_robots_txt
(
indexable
)
write_robots_txt
(
indexable
,
template_dir
)
shell_info
(
"
\n
"
<>
...
...
@@ -217,10 +218,10 @@ def run(["gen" | rest]) do
end
end
defp
write_robots_txt
(
indexable
)
do
defp
write_robots_txt
(
indexable
,
template_dir
)
do
robots_txt
=
EEx
.
eval_file
(
Path
.
expand
(
"
robots_txt.eex"
,
__DIR__
),
template_dir
<>
"/
robots_txt.eex"
,
indexable:
indexable
)
...
...
lib/mix/tasks/pleroma
/robots_txt.eex
→
priv/templates
/robots_txt.eex
View file @
e7611598
File moved
lib/mix/tasks/pleroma
/sample_config.eex
→
priv/templates
/sample_config.eex
View file @
e7611598
File moved
lib/mix/tasks/pleroma
/sample_psql.eex
→
priv/templates
/sample_psql.eex
View file @
e7611598
File moved
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment