Rename compose release to prod

compose/dev/.env

@@ -1,3 +0,0 @@
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
-POSTGRES_DB=confient_dev

compose/dev/docker-compose.yml

@@ -1,11 +0,0 @@
-version: "3"
-
-services:
-  postgres:
-    image: postgres:latest
-    ports:
-      - 127.0.0.1:5432:5432
-    environment:
-      - POSTGRES_USER=$POSTGRES_USER
-      - POSTGRES_DB=$POSTGRES_DB
-      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD

compose/prod/.env

@@ -1,7 +1,3 @@
-POSTGRES_USER=confient
-POSTGRES_DB=confient
-POSTGRES_PASSWORD=password
-CONFIENT_DATA=/tmp/confient/uploads
-POSTGRES_DATA=/tmp/confient/pg
-# gen one with mix phx.gen.secret
-SECRET_KEY_BASE=aQFwnczmCcy1JOQ/opboa+YSETybKWCELSCjI7i7atIBnLesYJ2dVYVgouIi7SYs
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=confient_dev

compose/prod/docker-compose.yml

@@ -1,26 +1,11 @@
-version: '3'
+version: "3"
 
 services:
   postgres:
     image: postgres:latest
-    volumes:
-      - $POSTGRES_DATA:/var/lib/postgres
+    ports:
+      - 127.0.0.1:5432:5432
     environment:
       - POSTGRES_USER=$POSTGRES_USER
       - POSTGRES_DB=$POSTGRES_DB
       - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
-
-  confient:
-    image: papey/confient:latest
-    ports:
-      - 127.0.0.1:4000:4000
-    volumes:
-      - $CONFIENT_DATA:/srv/confient/uploads
-    environment:
-      - POSTGRES_HOST=postgres
-      - POSTGRES_USER=$POSTGRES_USER
-      - DATABASE_URL=ecto://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
-      - SECRET_KEY_BASE=$SECRET_KEY_BASE
-      - CONFIENT_UPLOAD_DIR=/srv/confient/uploads
-    depends_on:
-      - postgres

compose/release/.env

@@ -0,0 +1,7 @@
+POSTGRES_USER=confient
+POSTGRES_DB=confient
+POSTGRES_PASSWORD=password
+CONFIENT_DATA=/tmp/confient/uploads
+POSTGRES_DATA=/tmp/confient/pg
+# gen one with mix phx.gen.secret
+SECRET_KEY_BASE=aQFwnczmCcy1JOQ/opboa+YSETybKWCELSCjI7i7atIBnLesYJ2dVYVgouIi7SYs

compose/release/docker-compose.yml

@@ -0,0 +1,26 @@
+version: '3'
+
+services:
+  postgres:
+    image: postgres:latest
+    volumes:
+      - $POSTGRES_DATA:/var/lib/postgres
+    environment:
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_DB=$POSTGRES_DB
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
+
+  confient:
+    image: papey/confient:latest
+    ports:
+      - 127.0.0.1:4000:4000
+    volumes:
+      - $CONFIENT_DATA:/srv/confient/uploads
+    environment:
+      - POSTGRES_HOST=postgres
+      - POSTGRES_USER=$POSTGRES_USER
+      - DATABASE_URL=ecto://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
+      - SECRET_KEY_BASE=$SECRET_KEY_BASE
+      - CONFIENT_UPLOAD_DIR=/srv/confient/uploads
+    depends_on:
+      - postgres

config/releases.exs

@@ -31,7 +31,7 @@ config :confient, ConfientWeb.Endpoint,
   secret_key_base: secret_key_base
 
 config :confient,
-  upload_dir: System.get_env("CONFIENT_UPLOAD_DIR", "/srv/confient/uploads"),
+  base_upload_dir: System.get_env("CONFIENT_BASE_UPLOAD_DIR", "/srv/confient/uploads"),
   timezone: System.get_env("CONFIENT_TIMEZONE", "Europe/Paris"),
   domain: System.get_env("CONFIENT_DOMAIN", "http://localhost:4000")
 

lib/confient_web/controllers/assignment_controller.ex

@@ -79,7 +79,7 @@ defmodule ConfientWeb.AssignmentController do
         conn |> put_flash(:error, "Devoir inexistant") |> redirect(to: "/")
 
       assignment ->
-        base = Application.get_env(:confient, :upload_dir)
+        base = Application.get_env(:confiant, :base_upload_dir, "/tmp/confient/uploads")
 
         files =
           Enum.map(assignment.students_works, fn v -> v.path end)

lib/confient_web/controllers/deposit_controller.ex

@@ -20,7 +20,7 @@ defmodule ConfientWeb.DepositController do
       {:ok, class} ->
         next_assignments = Confient.Works.get_next_assignments(class)
 
-        if length(next_assignments) > 0 && length(class.students) > 0 do
+        if length(next_assignments) > 0 && length(class.students) do
           changeset = Confient.Student.Work.changeset(%Confient.Student.Work{}, %{})
 
           student =

lib/confient_web/router.ex

@@ -19,7 +19,7 @@ defmodule ConfientWeb.Router do
 
     plug Plug.Static,
       at: "/uploads/",
-      from: Application.get_env(:confient, :upload_dir, "/srv/confient/uploads")
+      from: Application.get_env(:confiant, :base_upload_dir, "/tmp/confient/uploads")
   end
 
   scope "/", ConfientWeb do

lib/deposit.ex

@@ -7,10 +7,7 @@ defmodule Confient.Deposit do
 
   def verify_date(due) do
     date = DateTime.now!(Application.fetch_env!(:confient, :timezone)) |> DateTime.to_date()
-
-    if Timex.before?(date, due) || Timex.equal?(Timex.to_date(date), due),
-      do: :ok,
-      else: {:error, :date_too_late}
+    if Timex.before?(date, due), do: :ok, else: {:error, :date_too_late}
   end
 
   def verify_file(file) do