diff --git a/app.lua b/app.lua index b222a7a..6591a8b 100644 --- a/app.lua +++ b/app.lua @@ -3,6 +3,7 @@ local app = lapis.Application() local constants = require("constants") local babycode = require("lib.babycode") local html_escape = require("lapis.html").escape +local config = require("lapis.config").get() local db = require("lapis.db") -- sqlite starts without foreign key enforcement @@ -17,6 +18,7 @@ local function inject_constants(req) req.constants = constants math.randomseed(os.time()) req.__cachebust = math.random(99999) + req.__commit = config.commit end local function inject_methods(req) diff --git a/config.lua b/config.lua index d1e2f5d..a05c5d5 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,13 @@ local config = require("lapis.config") local secrets = require("secrets.secrets") +local commit = nil +local f = io.open(".git/refs/heads/main", "r") +if f then + print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!read commit") + commit = f:read(8) + f:close() +end config({"development", "production"}, { port = 8080, server = "nginx", @@ -11,6 +18,7 @@ config({"development", "production"}, { }, secret = "SUPER SECRET", session_name = "porom_session", + commit = commit, }) config("production", { diff --git a/views/base.etlua b/views/base.etlua index 7adedd0..a50f454 100644 --- a/views/base.etlua +++ b/views/base.etlua @@ -12,6 +12,10 @@
<% render("views.common.topnav") -%> <% content_for("inner") %> +