diff options
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/relaxng/publication-control.rnc | 14 | ||||
| -rw-r--r-- | schemas/relaxng/publication-control.rng | 59 | ||||
| -rw-r--r-- | schemas/sql/pubd.sql | 8 |
3 files changed, 3 insertions, 78 deletions
diff --git a/schemas/relaxng/publication-control.rnc b/schemas/relaxng/publication-control.rnc index 520f6357..bf605640 100644 --- a/schemas/relaxng/publication-control.rnc +++ b/schemas/relaxng/publication-control.rnc @@ -30,10 +30,10 @@ start = element msg { } # PDUs allowed in a query -query_elt = ( config_query | client_query ) +query_elt = client_query # PDUs allowed in a reply -reply_elt = ( config_reply | client_reply | report_error_reply ) +reply_elt = ( client_reply | report_error_reply ) # Tag attributes for bulk operations tag = attribute tag { xsd:token {maxLength="1024" } } @@ -54,16 +54,6 @@ uri = attribute uri { uri_t } # hierarchy delimiter. object_handle = xsd:string { maxLength="255" pattern="[\-_A-Za-z0-9/]+" } -# <config/> element -# config_handle attribute, create, list, and destroy commands omitted deliberately, see code for details - -config_payload = (element bpki_crl { base64 }?) - -config_query |= element config { attribute action { "set" }, tag?, config_payload } -config_reply |= element config { attribute action { "set" }, tag? } -config_query |= element config { attribute action { "get" }, tag? } -config_reply |= element config { attribute action { "get" }, tag?, config_payload } - # <client/> element client_handle = attribute client_handle { object_handle } diff --git a/schemas/relaxng/publication-control.rng b/schemas/relaxng/publication-control.rng index 8759b493..cf624a3c 100644 --- a/schemas/relaxng/publication-control.rng +++ b/schemas/relaxng/publication-control.rng @@ -52,15 +52,11 @@ </start> <!-- PDUs allowed in a query --> <define name="query_elt"> - <choice> - <ref name="config_query"/> - <ref name="client_query"/> - </choice> + <ref name="client_query"/> </define> <!-- PDUs allowed in a reply --> <define name="reply_elt"> <choice> - <ref name="config_reply"/> <ref name="client_reply"/> <ref name="report_error_reply"/> </choice> @@ -105,59 +101,6 @@ <param name="pattern">[\-_A-Za-z0-9/]+</param> </data> </define> - <!-- - <config/> element - config_handle attribute, create, list, and destroy commands omitted deliberately, see code for details - --> - <define name="config_payload"> - <optional> - <element name="bpki_crl"> - <ref name="base64"/> - </element> - </optional> - </define> - <define name="config_query" combine="choice"> - <element name="config"> - <attribute name="action"> - <value>set</value> - </attribute> - <optional> - <ref name="tag"/> - </optional> - <ref name="config_payload"/> - </element> - </define> - <define name="config_reply" combine="choice"> - <element name="config"> - <attribute name="action"> - <value>set</value> - </attribute> - <optional> - <ref name="tag"/> - </optional> - </element> - </define> - <define name="config_query" combine="choice"> - <element name="config"> - <attribute name="action"> - <value>get</value> - </attribute> - <optional> - <ref name="tag"/> - </optional> - </element> - </define> - <define name="config_reply" combine="choice"> - <element name="config"> - <attribute name="action"> - <value>get</value> - </attribute> - <optional> - <ref name="tag"/> - </optional> - <ref name="config_payload"/> - </element> - </define> <!-- <client/> element --> <define name="client_handle"> <attribute name="client_handle"> diff --git a/schemas/sql/pubd.sql b/schemas/sql/pubd.sql index d867706b..87b899e3 100644 --- a/schemas/sql/pubd.sql +++ b/schemas/sql/pubd.sql @@ -19,17 +19,9 @@ -- SQL objects needed by pubd.py. --- The config table is weird because it only has one row. - DROP TABLE IF EXISTS client; DROP TABLE IF EXISTS config; -CREATE TABLE config ( - config_id SERIAL NOT NULL, - bpki_crl LONGBLOB, - PRIMARY KEY (config_id) -) ENGINE=InnoDB; - CREATE TABLE client ( client_id SERIAL NOT NULL, client_handle VARCHAR(255) NOT NULL, |