projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-3' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 5484c43ef53a299e5da4099b9bb02cbc523d04be..19a80ffb205a2e68e35442b82eb0474f88dd6c1b 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,7
+4,7
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("
0.9
.0"),
+ version: version("
1.0
.0"),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@
-37,7
+37,7
@@
defmodule Pleroma.Mixfile do
pleroma: [
include_executables_for: [:unix],
applications: [ex_syslogger: :load, syslog: :load],
pleroma: [
include_executables_for: [:unix],
applications: [ex_syslogger: :load, syslog: :load],
- steps: [:assemble, ©_files/1]
+ steps: [:assemble, ©_files/1
, ©_nginx_config/1
]
]
]
]
]
]
]
@@
-48,6
+48,15
@@
defmodule Pleroma.Mixfile do
release
end
release
end
+ def copy_nginx_config(%{path: target_path} = release) do
+ File.cp!(
+ "./installation/pleroma.nginx",
+ Path.join([target_path, "installation", "pleroma.nginx"])
+ )
+
+ release
+ end
+
# Configuration for the OTP application.
#
# Type `mix help compile.app` for more information.
# Configuration for the OTP application.
#
# Type `mix help compile.app` for more information.