Skip to content

Commit

Permalink
Merge #11 - Fix XSD files and templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@williamdes
williamdes committed Feb 14, 2024
2 parents 203f1aa + 80fda1e commit 899e570
Show file tree
Hide file tree
Showing 12 changed files with 164 additions and 133 deletions.
1 change: 1 addition & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ root = true
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
Expand Down
32 changes: 16 additions & 16 deletions templates/xml/autodiscover-mobilesync.xml.tera
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8" ?>
<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
<Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006">
<Culture>en:en</Culture>
<User>
<DisplayName>{{ display_name }}</DisplayName>
<EMailAddress>{{ email_address }}</EMailAddress>
</User>
<Action>
<Settings>
<Server>
<Type>MobileSync</Type>
<Url>https://example.org/TODOmobilesyncURL</Url>
<Name>TODO: Mobile sync name</Name>
</Server>
</Settings>
</Action>
</Response>
<Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006">
<Culture>en:en</Culture>
<User>
<DisplayName>{{ display_name }}</DisplayName>
<EMailAddress>{{ email_address }}</EMailAddress>
</User>
<Action>
<Settings>
<Server>
<Type>MobileSync</Type>
<Url>https://example.org/TODOmobilesyncURL</Url>
<Name>TODO: Mobile sync name</Name>
</Server>
</Settings>
</Action>
</Response>
</Autodiscover>
142 changes: 71 additions & 71 deletions templates/xml/email_mobileconfig.tera
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,76 +2,76 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PayloadContent</key>
<array>
<dict>
<key>EmailAccountDescription</key>
<string>{{ display_name }}</string>
<key>EmailAccountName</key>
<string>{{ display_name }}</string>
<key>EmailAccountType</key>
<string>EmailTypeIMAP</string>
<key>EmailAddress</key>
<string>{{ email_address }}</string>
<key>IncomingMailServerAuthentication</key>
<string>EmailAuthPassword</string>
<key>IncomingMailServerHostName</key>
<string>{{ imap_hostname }}</string>
<key>IncomingMailServerPortNumber</key>
<integer>993</integer>
<key>IncomingMailServerUseSSL</key>
<true/>
<key>IncomingMailServerUsername</key>
<string>{{ username }}</string>
<key>OutgoingMailServerAuthentication</key>
<string>EmailAuthPassword</string>
<key>OutgoingMailServerHostName</key>
<string>{{ smtp_hostname }}</string>
<key>OutgoingMailServerPortNumber</key>
<integer>465</integer>
<key>OutgoingMailServerUseSSL</key>
<true/>
<key>OutgoingMailServerUsername</key>
<string>{{ username }}</string>
<key>OutgoingPasswordSameAsIncomingPassword</key>
<true/>
<key>PayloadDescription</key>
<string>Email account configuration for {{ email_address }}</string>
<key>PayloadDisplayName</key>
<string>{{ display_name }}</string>
<key>PayloadIdentifier</key>
<string>{{ domain }}.autoconfig.{{ profile_uuid }}</string>
<key>PayloadType</key>
<string>com.apple.mail.managed</string>
<key>PayloadUUID</key>
<string>{{ profile_uuid }}</string>
<key>PayloadVersion</key>
<real>1</real>
<key>SMIMEEnablePerMessageSwitch</key>
<false/>
<key>SMIMEEnabled</key>
<false/>
<key>SMIMESigningEnabled</key>
<false/>
<key>disableMailRecentsSyncing</key>
<false/>
</dict>
</array>
<key>PayloadDescription</key>
<string>Email account configuration for {{ email_address }}</string>
<key>PayloadDisplayName</key>
<string>{{ display_name }}</string>
<key>PayloadIdentifier</key>
<string>{{ domain }}.autoconfig.{{ mail_uuid }}</string>
<key>PayloadOrganization</key>
<string>{{ domain }}</string>
<key>PayloadRemovalDisallowed</key>
<false/>
<key>PayloadType</key>
<string>Configuration</string>
<key>PayloadUUID</key>
<string>{{ mail_uuid }}</string>
<key>PayloadVersion</key>
<integer>1</integer>
<key>PayloadContent</key>
<array>
<dict>
<key>EmailAccountDescription</key>
<string>{{ display_name }}</string>
<key>EmailAccountName</key>
<string>{{ display_name }}</string>
<key>EmailAccountType</key>
<string>EmailTypeIMAP</string>
<key>EmailAddress</key>
<string>{{ email_address }}</string>
<key>IncomingMailServerAuthentication</key>
<string>EmailAuthPassword</string>
<key>IncomingMailServerHostName</key>
<string>{{ imap_hostname }}</string>
<key>IncomingMailServerPortNumber</key>
<integer>993</integer>
<key>IncomingMailServerUseSSL</key>
<true/>
<key>IncomingMailServerUsername</key>
<string>{{ username }}</string>
<key>OutgoingMailServerAuthentication</key>
<string>EmailAuthPassword</string>
<key>OutgoingMailServerHostName</key>
<string>{{ smtp_hostname }}</string>
<key>OutgoingMailServerPortNumber</key>
<integer>465</integer>
<key>OutgoingMailServerUseSSL</key>
<true/>
<key>OutgoingMailServerUsername</key>
<string>{{ username }}</string>
<key>OutgoingPasswordSameAsIncomingPassword</key>
<true/>
<key>PayloadDescription</key>
<string>Email account configuration for {{ email_address }}</string>
<key>PayloadDisplayName</key>
<string>{{ display_name }}</string>
<key>PayloadIdentifier</key>
<string>{{ domain }}.autoconfig.{{ profile_uuid }}</string>
<key>PayloadType</key>
<string>com.apple.mail.managed</string>
<key>PayloadUUID</key>
<string>{{ profile_uuid }}</string>
<key>PayloadVersion</key>
<real>1</real>
<key>SMIMEEnablePerMessageSwitch</key>
<false/>
<key>SMIMEEnabled</key>
<false/>
<key>SMIMESigningEnabled</key>
<false/>
<key>disableMailRecentsSyncing</key>
<false/>
</dict>
</array>
<key>PayloadDescription</key>
<string>Email account configuration for {{ email_address }}</string>
<key>PayloadDisplayName</key>
<string>{{ display_name }}</string>
<key>PayloadIdentifier</key>
<string>{{ domain }}.autoconfig.{{ mail_uuid }}</string>
<key>PayloadOrganization</key>
<string>{{ domain }}</string>
<key>PayloadRemovalDisallowed</key>
<false/>
<key>PayloadType</key>
<string>Configuration</string>
<key>PayloadUUID</key>
<string>{{ mail_uuid }}</string>
<key>PayloadVersion</key>
<integer>1</integer>
</dict>
</plist>
12 changes: 7 additions & 5 deletions xml/xsd/autodiscover/AutodiscoverExchangeResponse.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" targetNamespace=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
>
<xs:element name="Response">
<xs:complexType>
<xs:sequence>
Expand Down
20 changes: 12 additions & 8 deletions xml/xsd/autodiscover/AutodiscoverExchangeResponseRedirect.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns=
"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006" targetNamespace=
"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
xmlns:exchange=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" schemaLocation="AutodiscoverResponseRedirect.xsd"/>
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
xmlns:exchange="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
>
<xs:import
namespace="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
schemaLocation="AutodiscoverResponseRedirect.xsd"
/>
<xs:element name="Autodiscover">
<xs:complexType>
<xs:sequence>
Expand Down
8 changes: 6 additions & 2 deletions xml/xsd/autodiscover/AutodiscoverRequest.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:schema
attributeFormDefault="unqualified"
elementFormDefault="qualified"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
>
<xs:element name="Autodiscover">
<xs:complexType>
<xs:sequence>
Expand Down
20 changes: 12 additions & 8 deletions xml/xsd/autodiscover/AutodiscoverResponse.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns=
"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006" targetNamespace=
"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
xmlns:exchange=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" schemaLocation="AutodiscoverExchangeResponse.xsd"/>
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
xmlns:exchange="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
>
<xs:import
namespace="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
schemaLocation="AutodiscoverExchangeResponse.xsd"
/>
<xs:element name="Autodiscover">
<xs:complexType>
<xs:sequence>
Expand Down
8 changes: 6 additions & 2 deletions xml/xsd/autodiscover/AutodiscoverResponseError.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
attributeFormDefault="unqualified"
elementFormDefault="qualified"
>
<xs:element name="Autodiscover">
<xs:complexType>
<xs:sequence>
Expand Down
12 changes: 7 additions & 5 deletions xml/xsd/autodiscover/AutodiscoverResponseRedirect.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" targetNamespace=
"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a" elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
>
<xs:element name="Response">
<xs:complexType>
<xs:sequence>
Expand Down
11 changes: 7 additions & 4 deletions xml/xsd/mobilesync/AutodiscoverMobileSyncResponse.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns=
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006" targetNamespace=
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
>
<xs:element name="Response">
<xs:complexType>
<xs:sequence>
Expand Down
11 changes: 7 additions & 4 deletions xml/xsd/mobilesync/AutodiscoverRequest.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns=
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/requestschema/2006" targetNamespace=
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/requestschema/2006" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/requestschema/2006"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/requestschema/2006"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
>
<xs:element name="Autodiscover">
<xs:complexType>
<xs:sequence>
Expand Down
20 changes: 12 additions & 8 deletions xml/xsd/mobilesync/AutodiscoverResponse.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns=
"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006" targetNamespace=
"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
xmlns:mobilesync=
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace=
"http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006" schemaLocation="AutodiscoverMobileSyncResponse.xsd"/>
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
targetNamespace="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006"
xmlns:mobilesync="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
>
<xs:import
namespace="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006"
schemaLocation="AutodiscoverMobileSyncResponse.xsd"
/>
<xs:element name="Autodiscover">
<xs:complexType>
<xs:sequence>
Expand Down

0 comments on commit 899e570

Please sign in to comment.