shigusegubu customs

This commit is contained in:
Pleroma 2018-01-01 16:36:40 +00:00 committed by SGSGB
commit fe8ec1b6f9
6 changed files with 17 additions and 8 deletions

View file

@ -47,9 +47,9 @@ version =
config :pleroma, :http, proxy_url: nil config :pleroma, :http, proxy_url: nil
config :pleroma, :instance, config :pleroma, :instance,
version: version, version: "2.1",
name: "Pleroma", name: "Shigusegubu",
email: "example@example.com", email: "pleroma@hjkos.com",
limit: 5000, limit: 5000,
upload_limit: 16_000_000, upload_limit: 16_000_000,
registrations_open: true, registrations_open: true,
@ -82,7 +82,7 @@ config :pleroma, :media_proxy,
# base_url: "https://cache.pleroma.social" # base_url: "https://cache.pleroma.social"
config :pleroma, :chat, enabled: true config :pleroma, :chat, enabled: false
config :ecto, json_library: Jason config :ecto, json_library: Jason

View file

@ -28,4 +28,11 @@ f_33b00b, /emoji/f_33b00b.png
f_33b22b, /emoji/f_33b22b.png f_33b22b, /emoji/f_33b22b.png
f_33h, /emoji/f_33h.png f_33h, /emoji/f_33h.png
f_33t, /emoji/f_33t.png f_33t, /emoji/f_33t.png
shinitai-shi, /emoji/shinitai-shi.png
shinitai-ni, /emoji/shinitai-ni.png
shinitai-ta, /emoji/shinitai-ta.png
shinitai-i, /emoji/shinitai-i.png
shinitai_shi, /emoji/shinitai_shi.png
shinitai_ni, /emoji/shinitai_ni.png
shinitai_ta, /emoji/shinitai_ta.png
shinitai_i, /emoji/shinitai_i.png

View file

@ -6,10 +6,12 @@ After=network.target postgresql.service
User=pleroma User=pleroma
WorkingDirectory=/home/pleroma/pleroma WorkingDirectory=/home/pleroma/pleroma
Environment="HOME=/home/pleroma" Environment="HOME=/home/pleroma"
Environment="MIX_ENV=prod"
ExecStart=/usr/local/bin/mix phx.server ExecStart=/usr/local/bin/mix phx.server
ExecReload=/bin/kill $MAINPID ExecReload=/bin/kill $MAINPID
KillMode=process KillMode=process
Restart=on-failure Restart=on-failure
StandardOutput=journal
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View file

@ -16,7 +16,7 @@ defmodule Pleroma.Web.Endpoint do
plug( plug(
Plug.Static, Plug.Static,
at: "/", at: "/",
from: :pleroma, from: "priv_sid/static",
only: ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png) only: ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png)
) )

View file

@ -134,7 +134,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
"html" -> "html" ->
conn conn
|> put_resp_content_type("text/html") |> put_resp_content_type("text/html")
|> send_file(200, "priv/static/index.html") |> send_file(200, "priv_sid/static/index.html")
_ -> _ ->
represent_activity(conn, activity, user) represent_activity(conn, activity, user)

View file

@ -366,7 +366,7 @@ defmodule Fallback.RedirectController do
if Mix.env() != :test do if Mix.env() != :test do
conn conn
|> put_resp_content_type("text/html") |> put_resp_content_type("text/html")
|> send_file(200, "priv/static/index.html") |> send_file(200, "priv_sid/static/index.html")
end end
end end
end end