diff --git a/config.yaml.example b/config.yaml.example index cd441a4..57b15a5 100644 --- a/config.yaml.example +++ b/config.yaml.example @@ -2,8 +2,11 @@ domain: example.org cookie_host: .example.org admin_email: admin@example.org -dev_domains: - - dev +default_project: 'foreignone' +subdomains: + dev: foreignone + ic: ic + icdev: ic mysql: host: "127.0.0.1" @@ -31,11 +34,10 @@ uploads_path: /uploads files_domain: files.example.org wiki_root: wiki -# deploy config -git_repo: git@github.com:example/example_org.git +skin_cache_prod_dir: replace_with_path_twig_cache_dir_on_prod +skin_cache_dev_dir: replace_with_path_twig_cache_dir_on_dev -# runtime variables -is_dev: false +git_repo: git@github.com:example/example_org.git book_versions: en: 1 diff --git a/src/engine/http/RequestHandler.php b/src/engine/http/RequestHandler.php index 8e402b3..fabbd84 100644 --- a/src/engine/http/RequestHandler.php +++ b/src/engine/http/RequestHandler.php @@ -30,7 +30,7 @@ abstract class RequestHandler throw new InvalidDomainException('invalid subdomain '.$sub); $globalContext->setProject($config['subdomains'][$sub]); } else { - $globalContext->setProject($config['project']); + $globalContext->setProject($config['default_project']); } if (!in_array($_SERVER['REQUEST_METHOD'], ['POST', 'GET'])) diff --git a/src/lib/foreignone/ForeignOneSkin.php b/src/lib/foreignone/ForeignOneSkin.php index ae8d32e..d83b1a4 100644 --- a/src/lib/foreignone/ForeignOneSkin.php +++ b/src/lib/foreignone/ForeignOneSkin.php @@ -73,7 +73,7 @@ class ForeignOneSkin 'render_options' => $this->options->getOptions(), 'app_config' => [ 'domain' => $config['domain'], - 'devMode' => $config['is_dev'], + 'devMode' => isDev(), 'cookieHost' => $config['cookie_host'], ], 'body_class' => $body_class,