From 51fd56020424dcca50c4b8cfb3877640a6a9656b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 16 Dec 2017 17:18:01 -0500 Subject: target config file locations, refine --- src/sdp/output/paths_source.d | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/sdp/output/paths_source.d') diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d index b81448c..1330606 100644 --- a/src/sdp/output/paths_source.d +++ b/src/sdp/output/paths_source.d @@ -98,12 +98,16 @@ template PodMatters() { string[] _image_dirs; return _image_dirs; } - auto src_fn() { + auto src_path_and_fn() { return _fns; } + auto src_fn() { + auto _fn = (src_path_and_fn).match(rgx.src_pth_sst_or_ssm).captures["filename"]; + return _fn; + } auto src_lng() { string _k; - if (auto m = (src_fn).match(rgx.language_code_and_filename)) { + if (auto m = (src_path_and_fn).match(rgx.language_code_and_filename)) { _k = m.captures[1]; } else { _k = "en"; @@ -156,6 +160,9 @@ template ConfigFilePaths() { E _env, ) { struct ConfFilePaths { + auto config_filename_document() { + return "config_document"; + } auto possible_config_path_locations_document() { /+ FIX clean up conf paths ↓ +/ /+ config local site (file system only, not in pod) +/ @@ -199,6 +206,9 @@ template ConfigFilePaths() { +/ return _possible_config_path_locations; } + auto config_filename_site() { + return "config_local_site"; + } auto possible_config_path_locations_local_site() { /+ FIX clean up conf paths ↓ +/ /+ config local site (file system only, not in pod) +/ -- cgit v1.2.3