about to change up a lot of stuff...

This commit is contained in:
brent s. 2020-06-14 00:53:19 -04:00
parent 6d3a9f5d3a
commit 2219fbe4c0
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
3 changed files with 143 additions and 96 deletions

View File

@ -7,6 +7,15 @@
<xs:include schemaLocation="../types/net.xsd"/>
<xs:include schemaLocation="../types/unix.xsd"/>

<xs:complexType name="e_repomir_owner">
<xs:sequence minOccurs="1">
<xs:choice minOccurs="1" maxOccurs="2">
<xs:element name="user" type="t_unix_posixUserGroup" maxOccurs="1"/>
<xs:element name="group" type="t_unix_posixUserGroup" maxOccurs="1"/>
</xs:choice>
</xs:sequence>
</xs:complexType>

<!-- Commented out; we don't bother with SSH variants. See also e_repomir_upstream -->
<!--
<xs:complexType name="e_repomir_sync_proto">
@ -18,6 +27,13 @@
</xs:complexType>
-->

<xs:complexType name="e_repomir_tstmp_file">
<xs:simpleContent>
<xs:extension base="t_unix_filepath">
<xs:attribute name="timeFormat" type="xs:string" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>

<xs:complexType name="e_repomir_upstream">
<xs:all minOccurs="1">
@ -26,8 +42,8 @@
<xs:element name="domain" type="xs:token" minOccurs="1"/>
<xs:element name="port" minOccurs="0" type="t_net_port"/>
<xs:element name="path" minOccurs="1" type="t_unix_filepath"/>
<xs:element name="bwlimit" minOccurs="0" type="xs:positiveInteger"/>
</xs:all>

</xs:complexType>

</xs:schema>

View File

@ -5,6 +5,29 @@

<xs:include schemaLocation="./std.xsd"/>

<xs:complexType name="t_unix_arg">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="value" type="xs:string" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>

<xs:complexType name="t_unix_args">
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="long" type="t_unix_arg"/>
<xs:element name="short" type="t_unix_arg"/>
</xs:choice>
</xs:complexType>

<!-- This is more or less the same as t_unix_filepath with the exception of it allowing "/". -->
<xs:simpleType name="t_unix_dirpath">
<xs:restriction base="xs:string">
<xs:pattern value="\s*(~?/[^/]*)+/?\s*"/>
<xs:whiteSpace value="collapse"/>
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="t_unix_filepath">
<xs:restriction base="xs:string">
<xs:pattern value="\s*(~?/[^/]+)+/?\s*"/>

View File

@ -19,7 +19,15 @@
<xs:complexType>
<xs:sequence minOccurs="1">
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="upstream" type="e_repomir_upstream"/>
<xs:element name="upstream" type="e_repomir_upstream" minOccurs="1" maxOccurs="unbounded"/>
<xs:element name="dest" type="t_unix_filepath" minOccurs="1" maxOccurs="1"/>
<xs:element name="lastLocalCheck" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="lastLocalSync" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="lastRemoteUpdate" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="1"/>
<xs:element name="lastRemoteSync" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="1"/>
<xs:element name="mountCheck" type="t_unix_dirpath" minOccurs="1"/>
<xs:element name="owner" type="e_repomir_owner" minOccurs="0"/>
<xs:element name="rsyncArgs" minOccurs="0" maxOccurs="1" type="t_unix_args"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="name" type="xs:ID" use="required"/>