ferron

Ferron is a fast and simple static website generator made with Lua.
Log | Files | Refs | Submodules | README | LICENSE

commit 10312d5c893de6cc91997c73d1931a292421f15b
parent 6ed490221209d5f71efe2bae3336be75a4c37a97
Author: Hugo Soucy <hsoucy@kronostechnologies.com>
Date:   Fri, 12 Oct 2018 14:10:48 -0400

Merge the app configuration file with the site configuration file

Diffstat:
Mferron/feed.lua | 3+--
Mferron/site.lua | 2+-
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ferron/feed.lua b/ferron/feed.lua @@ -1,5 +1,4 @@ -- -local config = require "config" local path = require "path" local fileutils = require "ferron.utilities.file-utils" local tableutils = require "ferron.utilities.table-utils" @@ -7,7 +6,7 @@ local templateutils = require "ferron.utilities.template-utils" local feed = {} function feed.makefeed(entries, destination) - local feedtypes = (not Ferron.site.siteconfig.feedtypes and config.feedtypes or Ferron.site.siteconfig.feedtypes) + local feedtypes = Ferron.site.siteconfig.feedtypes local feedpartials = path.isdir(Ferron.site.path .. Ferron.site.siteconfig.paths.templates .. "/partials") for k, v in pairs(feedtypes) do diff --git a/ferron/site.lua b/ferron/site.lua @@ -27,7 +27,7 @@ function site.getsiteinfos(sitename) -- Create a table with the basic infos of the site local site_infos = { path = site.location .. sitename, - siteconfig = site_config, + siteconfig = tableutils.extend({}, config, site_config), pagestable = {}, }