Merge branch 'environment-fixes' into 'master'

Final fixes for build

See merge request framasoft/mobilizon!153
This commit is contained in:
Thomas Citharel 2019-07-05 17:26:14 +02:00
commit 69fb1ec828
4 changed files with 6 additions and 5 deletions

View File

@ -4,11 +4,12 @@ config :mobilizon, MobilizonWeb.Endpoint,
http: [:inet6, port: System.get_env("MOBILIZON_INSTANCE_PORT") || 4000], http: [:inet6, port: System.get_env("MOBILIZON_INSTANCE_PORT") || 4000],
url: [ url: [
host: System.get_env("MOBILIZON_INSTANCE_HOST") || "mobilizon.me", host: System.get_env("MOBILIZON_INSTANCE_HOST") || "mobilizon.me",
port: 80 port: 443,
scheme: "https"
], ],
secret_key_base: secret_key_base:
System.get_env("MOBILIZON_SECRET") || "ThisShouldBeAVeryStrongStringPleaseReplaceMe", System.get_env("MOBILIZON_SECRET") || "ThisShouldBeAVeryStrongStringPleaseReplaceMe",
cache_static_manifest: "priv/static/js/manifest.json" cache_static_manifest: "priv/static/manifest.json"
# Configure your database # Configure your database
config :mobilizon, Mobilizon.Repo, config :mobilizon, Mobilizon.Repo,

View File

@ -9,7 +9,7 @@ module.exports = {
}, },
lintOnSave: false, lintOnSave: false,
runtimeCompiler: true, runtimeCompiler: true,
outputDir: '../priv/static/js', outputDir: '../priv/static',
configureWebpack: { configureWebpack: {
plugins: [ plugins: [
new Dotenv({ path: path.resolve(process.cwd(), '../.env') }), new Dotenv({ path: path.resolve(process.cwd(), '../.env') }),

View File

@ -31,7 +31,7 @@ defmodule MobilizonWeb.Router do
end end
pipeline :browser do pipeline :browser do
plug(Plug.Static, at: "/", from: "priv/static/js") plug(Plug.Static, at: "/", from: "priv/static")
plug(:accepts, ["html"]) plug(:accepts, ["html"])
plug(:fetch_session) plug(:fetch_session)
plug(:fetch_flash) plug(:fetch_flash)

View File

@ -101,6 +101,6 @@ defmodule MobilizonWeb.PageView do
end end
defp index_file_path() do defp index_file_path() do
Path.join(Application.app_dir(:mobilizon, "priv/static/js"), "index.html") Path.join(Application.app_dir(:mobilizon, "priv/static"), "index.html")
end end
end end