diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-15 02:50:27 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-15 02:50:27 +0000 |
| commit | c708656b5e4dd0a7c7f9ec5fb0116f542a85e309 (patch) | |
| tree | 7e67da76a93f3eb77f48dfe28ef6a51606b64665 /lib/pleroma | |
| parent | 7ecc201029a8c90cf5dc3313ff78d56eb0a2445c (diff) | |
| parent | 3dadaa4432b442d75b0ac0425aa05527d52f0e7a (diff) | |
| download | pleroma-c708656b5e4dd0a7c7f9ec5fb0116f542a85e309.tar.gz | |
Merge branch 'robotstxt' into 'develop'
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/plugs/instance_static.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/plugs/instance_static.ex b/lib/pleroma/plugs/instance_static.ex index 41125921a..a64f1ea80 100644 --- a/lib/pleroma/plugs/instance_static.ex +++ b/lib/pleroma/plugs/instance_static.ex @@ -21,7 +21,8 @@ defmodule Pleroma.Plugs.InstanceStatic do end end - @only ~w(index.html static emoji packs sounds images instance favicon.png sw.js sw-pleroma.js) + @only ~w(index.html robots.txt static emoji packs sounds images instance favicon.png sw.js + sw-pleroma.js) def init(opts) do opts diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 697b1bc3a..fa2d1cbe7 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -25,7 +25,7 @@ defmodule Pleroma.Web.Endpoint do at: "/", from: :pleroma, only: - ~w(index.html static finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc) + ~w(index.html robots.txt static finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc) # credo:disable-for-previous-line Credo.Check.Readability.MaxLineLength ) |