Compare commits
	
		
			3 Commits
		
	
	
		
			883a2825e5
			...
			69ba0245bb
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 69ba0245bb | |||
| 597aa1f2e0 | |||
| fbc4c479e8 | 
@@ -31,7 +31,7 @@ config :confient, ConfientWeb.Endpoint,
 | 
			
		||||
  secret_key_base: secret_key_base
 | 
			
		||||
 | 
			
		||||
config :confient,
 | 
			
		||||
  base_upload_dir: System.get_env("CONFIENT_BASE_UPLOAD_DIR", "/srv/confient/uploads"),
 | 
			
		||||
  upload_dir: System.get_env("CONFIENT_UPLOAD_DIR", "/srv/confient/uploads"),
 | 
			
		||||
  timezone: System.get_env("CONFIENT_TIMEZONE", "Europe/Paris"),
 | 
			
		||||
  domain: System.get_env("CONFIENT_DOMAIN", "http://localhost:4000")
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -79,7 +79,7 @@ defmodule ConfientWeb.AssignmentController do
 | 
			
		||||
        conn |> put_flash(:error, "Devoir inexistant") |> redirect(to: "/")
 | 
			
		||||
 | 
			
		||||
      assignment ->
 | 
			
		||||
        base = Application.get_env(:confiant, :base_upload_dir, "/tmp/confient/uploads")
 | 
			
		||||
        base = Application.get_env(:confiant, :upload_dir)
 | 
			
		||||
 | 
			
		||||
        files =
 | 
			
		||||
          Enum.map(assignment.students_works, fn v -> v.path end)
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ defmodule ConfientWeb.Router do
 | 
			
		||||
 | 
			
		||||
    plug Plug.Static,
 | 
			
		||||
      at: "/uploads/",
 | 
			
		||||
      from: Application.get_env(:confiant, :base_upload_dir, "/tmp/confient/uploads")
 | 
			
		||||
      from: Application.get_env(:confiant, :upload_dir, "/srv/confient/uploads")
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  scope "/", ConfientWeb do
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user