Skip to content

Commit

Permalink
Add support for multiple staticDirs
Browse files Browse the repository at this point in the history
This commit adds support for multiple statDirs both on the global and language level.

A simple `config.toml` example:

```bash
staticDir = ["static1", "static2"]
[languages]
[languages.no]
staticDir = ["staticDir_override", "static_no"]
baseURL = "https://example.no"
languageName = "Norsk"
weight = 1
title = "På norsk"

[languages.en]
staticDir2 = "static_en"
baseURL = "https://example.com"
languageName = "English"
weight = 2
title = "In English"
```

In the above, with no theme used:

the English site will get its static files as a union of "static1", "static2" and "static_en". On file duplicates, the right-most version will win.
the Norwegian site will get its static files as a union of "staticDir_override" and "static_no".

This commit also concludes the Multihost support in #4027.

Fixes #36
Closes #4027
  • Loading branch information
bep committed Nov 17, 2017
1 parent 2e04657 commit 60dfb9a
Show file tree
Hide file tree
Showing 25 changed files with 822 additions and 270 deletions.
6 changes: 3 additions & 3 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
version = "1.5.0"

[[constraint]]
branch = "master"
name = "github.com/spf13/afero"
version = "1.0.0"

[[constraint]]
name = "github.com/spf13/cast"
Expand Down
3 changes: 2 additions & 1 deletion commands/commandeer.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ type commandeer struct {
*deps.DepsCfg
pathSpec *helpers.PathSpec
visitedURLs *types.EvictingStringQueue
configured bool

configured bool
}

func (c *commandeer) Set(key string, value interface{}) {
Expand Down
Loading

0 comments on commit 60dfb9a

Please sign in to comment.