diff --git a/.gitignore b/.gitignore
index 3292d647c680aeb8fe718e8094d1274c5149a844..ecdfdf7be9d0f55f55e571a8229a175d5ff279cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
/pkg
/logs
/vendor
+/config
media-repo*.yaml
homeserver.yaml
diff --git a/Dockerfile b/Dockerfile
index f972452a1b174228dc02b4f15d7be2271440590f..7e3eae95aa5e9523f3a79ca59e9716e616fdae22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,8 @@ COPY ./config.sample.yaml /etc/media-repo.yaml.sample
COPY ./migrations /var/lib/media-repo-migrations
COPY ./docker/run.sh /usr/local/bin/
+ENV REPO_CONFIG=/data/media-repo.yaml
+
CMD /usr/local/bin/run.sh
VOLUME ["/data", "/media"]
EXPOSE 8000
diff --git a/cmd/media_repo/main.go b/cmd/media_repo/main.go
index 7c485c57a284d2e9171a4606c68fd4e17af2a5a4..a29cdb12a73821c70b997e84a10cf6b30612b902 100644
--- a/cmd/media_repo/main.go
+++ b/cmd/media_repo/main.go
@@ -4,6 +4,7 @@ import (
"context"
"flag"
"fmt"
+ "os"
"github.com/sirupsen/logrus"
"github.com/turt2live/matrix-media-repo/api/webserver"
@@ -23,6 +24,12 @@ func main() {
templatesPath := flag.String("templates", "./templates", "The absolute path for the templates folder")
flag.Parse()
+ // Override config path with config for Docker users
+ configEnv := os.Getenv("REPO_CONFIG")
+ if configEnv != "" {
+ configPath = &configEnv
+ }
+
config.Path = *configPath
config.Runtime.MigrationsPath = *migrationsPath
config.Runtime.TemplatesPath = *templatesPath
diff --git a/common/config/config.go b/common/config/config.go
index 234eb527df558f3d3b10a5e49bcc105be93a0dde..659adc7e8b1163c4bb0e3082c2fee961c64dfd39 100644
--- a/common/config/config.go
+++ b/common/config/config.go
@@ -4,8 +4,11 @@ import (
"fmt"
"io/ioutil"
"os"
+ "path"
+ "sort"
"sync"
+ "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
)
@@ -172,7 +175,7 @@ func ReloadConfig() error {
c := NewDefaultConfig()
// Write a default config if the one given doesn't exist
- _, err := os.Stat(Path)
+ info, err := os.Stat(Path)
exists := err == nil || !os.IsNotExist(err)
if !exists {
fmt.Println("Generating new configuration...")
@@ -197,16 +200,45 @@ func ReloadConfig() error {
}
}
- f, err := os.Open(Path)
+ // Get new info about the possible directory after creating
+ info, err = os.Stat(Path)
if err != nil {
return err
}
- defer f.Close()
- buffer, err := ioutil.ReadAll(f)
- err = yaml.Unmarshal(buffer, &c)
- if err != nil {
- return err
+ pathsOrdered := make([]string, 0)
+ if info.IsDir() {
+ logrus.Info("Config is a directory - loading all files over top of each other")
+
+ files, err := ioutil.ReadDir(Path)
+ if err != nil {
+ return err
+ }
+
+ for _, f := range files {
+ pathsOrdered = append(pathsOrdered, path.Join(Path, f.Name()))
+ }
+
+ sort.Strings(pathsOrdered)
+ } else {
+ pathsOrdered = append(pathsOrdered, Path)
+ }
+
+ for _, p := range pathsOrdered {
+ logrus.Info("Loading config file: ", p)
+ f, err := os.Open(p)
+ if err != nil {
+ return err
+ }
+
+ //noinspection GoDeferInLoop
+ defer f.Close()
+
+ buffer, err := ioutil.ReadAll(f)
+ err = yaml.Unmarshal(buffer, &c)
+ if err != nil {
+ return err
+ }
}
instance = c
diff --git a/docs/config.md b/docs/config.md
new file mode 100644
index 0000000000000000000000000000000000000000..a91f250411f336f23d705de48375878bdbfbd12e
--- /dev/null
+++ b/docs/config.md
@@ -0,0 +1,57 @@
+# Media repository configuration
+
+Simple deployments are going to make the best use of copy/pasting the sample config and using that. More complicated
+deployments might want to make use of layering/splitting out their configs more verbosely. Splitting out the configs
+also gives admins the opportunity to have more detailed per-domain control over their repository.
+
+To make use of the layering, use the `-config` switch to point it at the directory containing your config files. In
+Docker this takes the shape of setting the environment variable `REPO_CONFIG` to something like `/data/config`.
+
+Config files/directories are automatically watched to apply changes on the fly.
+
+## Structure
+
+Config directories are shallow and do not recurse (this means all your files go into one giant directory). Files are
+read in alphabetical order - it is recommended to prefix config files with a number for predictable ordering.
+
+Files override one another unless they are indicated as being per-domain (more on that later on in this doc). Before
+reading the config directory, the media repo will apply the default config, which is the same as the sample config.
+As it loads each file, it overrides whatever the file has defined.
+
+Simply put, given `00-main.yaml`, `01-bind.yaml`, and `02-datastores.yaml` the media repo will read the defaults, then
+apply 00, then 01, then 02. The file names do not matter aside from application order.
+
+## Per-domain configs
+
+When using per-domain configs the `homeservers` field of the main config can be ignored. The `homeservers` option
+is still respected for simple configuration of domains, though it is recommended to use per-domain configs if you're
+splitting out your overall config.
+
+Per-domain configs go in the same directory as all the other config files with the same ordering behaviour. To flag
+a config as a per-domain config, ensure the `homeserver` property is set.
+
+A minimal per-domain config would be:
+```yaml
+homeserver: example.org
+csApi: "https://example.org"
+backoffAt: 10
+adminApiKind: "matrix"
+```
+
+Any options from the main config can then be overridden per-domain with the exception of:
+* `homeservers` - because why would you.
+* `database` - because the database is for the whole process.
+* `repo` - because the listener configuration is for the whole process.
+* `sharedSecretAuth` - because the option doesn't apply to a particular domain.
+* `rateLimit` - because this configuration is applied before the host is known.
+* `metrics` - because this affects the whole process.
+
+To override a value, simply provide it in any valid per-domain config:
+
+```yaml
+homeserver: example.org
+identicons:
+ enabled: false
+```
+
+Per-domain configs can also be layered - just ensure that each layer has the `homeserver` property in it.