New constants/config merge system

src/site/api/proxy.js

@@ -33,7 +33,7 @@ module.exports = [
 					statusCode: 200,
 					contentType: "image/jpeg",
 					headers: {
-						"Cache-Control": constants.image_cache_control
+						"Cache-Control": constants.caching.image_cache_control
 					},
 					stream: image.stream("jpg")
 				}
@@ -54,7 +54,7 @@ module.exports = [
 			})
 		} else {
 			return proxy(url, {
-				"Cache-Control": constants.image_cache_control
+				"Cache-Control": constants.caching.image_cache_control
 			})
 		}
 	}}

src/site/repl.js

@@ -1,5 +1,6 @@
 const {instance, pugCache, wss} = require("./passthrough")
 const {requestCache, timelineEntryCache} = require("../lib/collectors")
+const constants = require("../lib/constants")
 const util = require("util")
 const repl = require("repl")
 const vm = require("vm")