Skip to content

Commit 884ebcc

Browse files
committed
ncm-metaconfig: httpd: support casscope
1 parent a7c44db commit 884ebcc

File tree

5 files changed

+10
-1
lines changed

5 files changed

+10
-1
lines changed

ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/profiles/keystone.pan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ prefix "contents";
8080
"processgroup", "keystone-public",
8181
"applicationgroup", "%{GLOBAL}",
8282
),
83+
"casscope","/"
8384
);
8485
append(clone(data));
8586

ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/regexps/keystone/base

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Base test for keystone wsgi config
1313
^ wsgiapplicationgroup %\{GLOBAL\}
1414
^ wsgipassauthorization on
1515
^ wsgiprocessgroup keystone-public
16+
^ casscope /
1617
^</location>
1718
^<location /identity_admin>
1819
^ options \+ExecCGI
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[%- FOREACH casscope IN desc %]
2+
casscope casscope.path
3+
[%- END -%]

ncm-metaconfig/src/main/metaconfig/httpd/config/directory_basic.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ directoryindex [% desc.directoryindex.join(' ') %]
55
[%- IF desc.exists('limitrequestbody') %]
66
limitrequestbody [% desc.limitrequestbody %]
77
[% END -%]
8-
[%- to_process = ['rewrite', 'handler', 'perl', 'outputfilter', 'env', 'limit', 'proxy', 'wsgi', 'expires'] -%]
8+
[%- to_process = ['rewrite', 'handler', 'perl', 'outputfilter', 'env', 'limit', 'proxy', 'wsgi', 'expires', 'casscope'] -%]
99
[%- FOREACH p IN to_process -%]
1010
[%- IF desc.exists(p) -%]
1111
[% INCLUDE "metaconfig/httpd/config/${p}.tt" desc=desc.$p %]

ncm-metaconfig/src/main/metaconfig/httpd/pan/schema.pan

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,9 @@ type httpd_expires = {
594594
"default" ? string
595595
"bytype" ? string{}
596596
};
597+
type httpd_casscope = {
598+
"path" : string
599+
}
597600

598601
type httpd_directory = {
599602
include httpd_file
@@ -610,6 +613,7 @@ type httpd_directory = {
610613
"davrods" ? httpd_davrods
611614
"files" ? httpd_file[]
612615
"expires" ? httpd_expires
616+
"casscope" ? httpd_casscope
613617
};
614618

615619
type httpd_vhost_ip = string with is_ip(SELF) || SELF == '*';

0 commit comments

Comments
 (0)