Merge branch '485-use-httpfs-with-httprange' into 'master'

Allow registering a file protocol in the zip VFS

See merge request gitlab-org/gitlab-pages!429

1 files changed, 3 insertions, 1 deletions

diff --git a/main.go b/main.go
index c6b2c451..9921bc96 100644
--- a/main.go
+++ b/main.go
@@ -160,6 +160,8 @@ func setGitLabAPISecretKey(secretFile string, config *appConfig) {
 func configFromFlags() appConfig {
 	var config appConfig
 
+	config.PagesRoot = *pagesRoot
+
 	config.Domain = strings.ToLower(*pagesDomain)
 	config.RedirectHTTP = *redirectHTTP
 	config.HTTP2 = *useHTTP2
@@ -343,7 +345,7 @@ func appMain() {
 	}
 
 	if *daemonUID != 0 || *daemonGID != 0 {
-		if err := daemonize(config, *daemonUID, *daemonGID, *daemonInplaceChroot, *pagesRoot); err != nil {
+		if err := daemonize(config, *daemonUID, *daemonGID, *daemonInplaceChroot, config.PagesRoot); err != nil {
 			errortracking.Capture(err)
 			fatal(err, "could not create pages daemon")
 		}