Merge branch 'master' of square-r00t.net:xml

This commit is contained in:
brent s. 2020-07-23 23:41:58 -04:00
commit 1f9a4ed88d
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
3 changed files with 22 additions and 2 deletions

View File

@ -16,6 +16,10 @@
</xs:sequence>
</xs:complexType>

<xs:complexType name="e_repomir_ignoreExit">
<xs:attribute name="returns" type="t_repomir_returnCodeList" use="required"/>
</xs:complexType>

<!-- Commented out; we don't bother with SSH variants. See also e_repomir_upstream -->
<!--
<xs:complexType name="e_repomir_sync_proto">
@ -31,10 +35,19 @@
<xs:simpleContent>
<xs:extension base="t_unix_filepath">
<xs:attribute name="timeFormat" type="xs:string" use="optional" default="UNIX_EPOCH"/>
<xs:attribute name="offset" type="xs:integer" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>

<xs:complexType name="e_repomir_remote_tstmp_file">
<xs:complexContent>
<xs:extension base="e_repomir_tstmp_file">
<xs:attribute name="mtime" type="xs:boolean" use="optional" default="false"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>

<xs:complexType name="e_repomir_upstream">
<xs:all minOccurs="1">
<!-- <xs:element name="syncType" type="e_repomir_sync_proto" minOccurs="1"/> -->
@ -43,6 +56,8 @@
<xs:element name="port" minOccurs="0" type="t_net_port"/>
<xs:element name="path" minOccurs="1" type="t_unix_dirpath"/>
</xs:all>
<xs:attribute name="delayCheck" type="xs:duration" use="optional"/>
<xs:attribute name="offset" type="xs:duration" use="optional"/>
</xs:complexType>

</xs:schema>

View File

@ -3,6 +3,10 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">

<xs:simpleType name="t_repomir_returnCodeList">
<xs:list itemType="xs:integer"/>
</xs:simpleType>

<xs:simpleType name="t_repomir_synctype">
<xs:restriction base="xs:token">
<xs:enumeration value="rsync"/>

View File

@ -23,11 +23,12 @@
<xs:element name="dest" type="t_unix_dirpath" 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="lastRemoteUpdate" type="e_repomir_remote_tstmp_file" minOccurs="0" maxOccurs="1"/>
<xs:element name="lastRemoteSync" type="e_repomir_remote_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:element name="rsyncIgnore" minOccurs="0" maxOccurs="1" type="e_repomir_ignoreExit"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="name" type="xs:ID" use="required"/>