From b4c11824d801f768986ace955ea52a64a45c33b1 Mon Sep 17 00:00:00 2001 From: Christopher Bennage Date: Tue, 20 Feb 2018 10:37:30 -0800 Subject: [PATCH 1/7] moving content out of the template --- build/reference-architectures/templates/index.liquid | 12 +++++++----- docs/reference-architectures/index.json | 3 +++ docs/reference-architectures/index.md | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build/reference-architectures/templates/index.liquid b/build/reference-architectures/templates/index.liquid index b4b62dba0d5..29940265ab5 100644 --- a/build/reference-architectures/templates/index.liquid +++ b/build/reference-architectures/templates/index.liquid @@ -1,13 +1,15 @@ --- -title: Azure Reference Architectures -description: Reference architectures, blueprints, and prescriptive implementation guidance for common workloads on Azure. +title: {{ title }} +description: {{ description }} layout: LandingPage -NOTE: edit the template in ./build/reference-architectures !!! --- + + + -# Azure Reference Architectures +# {{ title }} -Our reference architectures are arranged by scenario, with related architectures grouped together. Each architecture includes recommended practices, along with considerations for scalability, availability, manageability, and security. Most also include a deployable solution. +{{ summary }}
+ \ No newline at end of file From 8a054544ee6e91eb7fd96fe2a7ea3e7b48faffae Mon Sep 17 00:00:00 2001 From: Christopher Bennage Date: Tue, 20 Feb 2018 11:21:50 -0800 Subject: [PATCH 3/7] adding dmz --- build/build.js | 3 +- docs/reference-architectures/dmz/index.json | 19 ++++++ docs/reference-architectures/dmz/index.md | 74 ++++++++++++--------- 3 files changed, 63 insertions(+), 33 deletions(-) create mode 100644 docs/reference-architectures/dmz/index.json diff --git a/build/build.js b/build/build.js index c21876df251..e5c8f03f0fd 100644 --- a/build/build.js +++ b/build/build.js @@ -1,3 +1,4 @@ const formatIndexFor = require('./reference-architectures/index'); formatIndexFor('.'); -formatIndexFor('app-service-web-app'); \ No newline at end of file +formatIndexFor('app-service-web-app'); +formatIndexFor('dmz'); \ No newline at end of file diff --git a/docs/reference-architectures/dmz/index.json b/docs/reference-architectures/dmz/index.json new file mode 100644 index 00000000000..8016ade1f18 --- /dev/null +++ b/docs/reference-architectures/dmz/index.json @@ -0,0 +1,19 @@ +{ + "title": "Network DMZ", + "description": "Explains and compares the different methods available for protecting applications and components running in Azure as part of a hybrid system from unauthorized intrusion.", + "summary": "These reference architectures show proven practices for creating a network DMZ that protects the boundary between an Azure virtual network and an on-premises network or the Internet.", + "series": [ + { + "title": "DMZ between Azure and on-premises", + "url": "./secure-vnet-hybrid.md", + "image": "./images/secure-vnet-hybrid.svg", + "summary": "Implements a secure hybrid network that extends an on-premises network to Azure." + }, + { + "title": "DMZ between Azure and the Internet", + "url": "./secure-vnet-dmz.md", + "image": "./images/secure-vnet-dmz.svg", + "summary": "Implements a secure network that accepts Internet traffic to Azure." + } + ] +} \ No newline at end of file diff --git a/docs/reference-architectures/dmz/index.md b/docs/reference-architectures/dmz/index.md index 709789c5d17..e0ee58413ba 100644 --- a/docs/reference-architectures/dmz/index.md +++ b/docs/reference-architectures/dmz/index.md @@ -3,48 +3,58 @@ title: Network DMZ description: Explains and compares the different methods available for protecting applications and components running in Azure as part of a hybrid system from unauthorized intrusion. layout: LandingPage --- + + + + # Network DMZ These reference architectures show proven practices for creating a network DMZ that protects the boundary between an Azure virtual network and an on-premises network or the Internet. - + + \ No newline at end of file From 184fbfbbf840943e7e811296c9058efe740a567e Mon Sep 17 00:00:00 2001 From: Christopher Bennage Date: Tue, 20 Feb 2018 11:50:58 -0800 Subject: [PATCH 4/7] hybrid networking --- build/build.js | 3 +- .../hybrid-networking/index.json | 32 +++++ .../hybrid-networking/index.md | 135 ++++++++++-------- 3 files changed, 107 insertions(+), 63 deletions(-) create mode 100644 docs/reference-architectures/hybrid-networking/index.json diff --git a/build/build.js b/build/build.js index e5c8f03f0fd..b20924a86cd 100644 --- a/build/build.js +++ b/build/build.js @@ -1,4 +1,5 @@ const formatIndexFor = require('./reference-architectures/index'); formatIndexFor('.'); formatIndexFor('app-service-web-app'); -formatIndexFor('dmz'); \ No newline at end of file +formatIndexFor('dmz'); +formatIndexFor('hybrid-networking'); \ No newline at end of file diff --git a/docs/reference-architectures/hybrid-networking/index.json b/docs/reference-architectures/hybrid-networking/index.json new file mode 100644 index 00000000000..d6226bf1010 --- /dev/null +++ b/docs/reference-architectures/hybrid-networking/index.json @@ -0,0 +1,32 @@ +{ + "title": "Connect an on-premises network to Azure", + "description": "Recommended architectures for secure, robust network connections between on-premises networks and Azure.", + "summary": "These reference architectures show proven practices for creating a robust network connection between an on-premises network and Azure. [Which should I choose?](./considerations.md)", + "series": [ + { + "title": "VPN", + "url": "./vpn.md", + "image": "./images/vpn.svg", + "summary": "Extend an on-premises network to Azure using a site-to-site virtual private network (VPN)." + }, + { + "title": "ExpressRoute", + "url": "./expressroute.md", + "image": "./images/expressroute.svg", + "summary": "Extend an on-premises network to Azure using Azure ExpressRoute." + }, + { + "title": "ExpressRoute with VPN failover", + "url": "./expressroute-vpn-failover.md", + "image": "./images/expressroute-vpn-failover.svg", + "summary": "Extend an on-premises network to Azure using Azure ExpressRoute, with a VPN as a failover connection." + }, + { + "title": "Hub-spoke topology", + "url": "./hub-spoke.md", + "image": "./images/hub-spoke.svg", + "summary": "The hub is a central point of connectivity to your on-premises network. The spokes are VNets that peer with the hub, and can be used to isolate workloads." + } + ] +} + diff --git a/docs/reference-architectures/hybrid-networking/index.md b/docs/reference-architectures/hybrid-networking/index.md index 8e13d2980f4..d39406b028b 100644 --- a/docs/reference-architectures/hybrid-networking/index.md +++ b/docs/reference-architectures/hybrid-networking/index.md @@ -3,87 +3,98 @@ title: Connect an on-premises network to Azure description: Recommended architectures for secure, robust network connections between on-premises networks and Azure. layout: LandingPage --- + + + # Connect an on-premises network to Azure These reference architectures show proven practices for creating a robust network connection between an on-premises network and Azure. [Which should I choose?](./considerations.md) - + +
    +
\ No newline at end of file From 77ed9d55d5c27006f04a40b5687f72982cc78183 Mon Sep 17 00:00:00 2001 From: Christopher Bennage Date: Tue, 20 Feb 2018 12:01:17 -0800 Subject: [PATCH 5/7] adding identity --- build/build.js | 3 +- .../identity/index.json | 31 ++++ .../reference-architectures/identity/index.md | 137 ++++++++++-------- 3 files changed, 107 insertions(+), 64 deletions(-) create mode 100644 docs/reference-architectures/identity/index.json diff --git a/build/build.js b/build/build.js index b20924a86cd..63363fc37de 100644 --- a/build/build.js +++ b/build/build.js @@ -2,4 +2,5 @@ const formatIndexFor = require('./reference-architectures/index'); formatIndexFor('.'); formatIndexFor('app-service-web-app'); formatIndexFor('dmz'); -formatIndexFor('hybrid-networking'); \ No newline at end of file +formatIndexFor('hybrid-networking'); +formatIndexFor('identity'); \ No newline at end of file diff --git a/docs/reference-architectures/identity/index.json b/docs/reference-architectures/identity/index.json new file mode 100644 index 00000000000..c95ad7af761 --- /dev/null +++ b/docs/reference-architectures/identity/index.json @@ -0,0 +1,31 @@ +{ + "title": "Identity management", + "description": "Explains and compares the different methods available for managing identity in hybrid systems that span the on-premises/cloud boundary with Azure.", + "summary": "These reference architectures show options for integrating your on-premises Active Directory (AD) environment with an Azure network. [Which should I choose?](./considerations.md)", + "series": [ + { + "title": "Integrate with Azure Active Directory", + "url": "./azure-ad.md", + "image": "./images/azure-ad.svg", + "summary": "Integrate on-premises Active Directory domains and forests with Azure AD." + }, + { + "title": "Extend AD DS to Azure", + "url": "./adds-extend-domain.md", + "image": "./images/adds-extend-domain.svg", + "summary": "Extend your Active Directory environment to Azure using Active Directory Domain Services." + }, + { + "title": "Create an AD DS forest in Azure", + "url": "./adds-forest.md", + "image": "./images/adds-forest.svg", + "summary": "Create a separate AD domain in Azure that is trusted by domains in your on-premises forest." + }, + { + "title": "Extend AD FS to Azure", + "url": "./adfs.md", + "image": "./images/adfs.svg", + "summary": "Use Active Directory Federation Services for federated authentication and authorization in Azure." + } + ] +} \ No newline at end of file diff --git a/docs/reference-architectures/identity/index.md b/docs/reference-architectures/identity/index.md index 3a438543273..f9f7215a813 100644 --- a/docs/reference-architectures/identity/index.md +++ b/docs/reference-architectures/identity/index.md @@ -1,89 +1,100 @@ --- -title: Identity management +title: Identity management description: Explains and compares the different methods available for managing identity in hybrid systems that span the on-premises/cloud boundary with Azure. layout: LandingPage --- + + + # Identity management These reference architectures show options for integrating your on-premises Active Directory (AD) environment with an Azure network. [Which should I choose?](./considerations.md) - + +
    +
\ No newline at end of file From bcb91b8d2b7378480442f4050f9dd5c597a19706 Mon Sep 17 00:00:00 2001 From: Christopher Bennage Date: Tue, 20 Feb 2018 12:10:26 -0800 Subject: [PATCH 6/7] adding vms --- build/build.js | 4 +- .../hybrid-networking/index.md | 2 +- .../reference-architectures/identity/index.md | 2 +- .../virtual-machines-linux/index.json | 32 ++++ .../virtual-machines-linux/index.md | 141 ++++++++++-------- .../virtual-machines-windows/index.json | 32 ++++ .../virtual-machines-windows/index.md | 141 ++++++++++-------- 7 files changed, 221 insertions(+), 133 deletions(-) create mode 100644 docs/reference-architectures/virtual-machines-linux/index.json create mode 100644 docs/reference-architectures/virtual-machines-windows/index.json diff --git a/build/build.js b/build/build.js index 63363fc37de..cb4b5b01750 100644 --- a/build/build.js +++ b/build/build.js @@ -3,4 +3,6 @@ formatIndexFor('.'); formatIndexFor('app-service-web-app'); formatIndexFor('dmz'); formatIndexFor('hybrid-networking'); -formatIndexFor('identity'); \ No newline at end of file +formatIndexFor('identity'); +formatIndexFor('virtual-machines-linux'); +formatIndexFor('virtual-machines-windows'); \ No newline at end of file diff --git a/docs/reference-architectures/hybrid-networking/index.md b/docs/reference-architectures/hybrid-networking/index.md index d39406b028b..85c0393bd82 100644 --- a/docs/reference-architectures/hybrid-networking/index.md +++ b/docs/reference-architectures/hybrid-networking/index.md @@ -9,7 +9,7 @@ layout: LandingPage # Connect an on-premises network to Azure -These reference architectures show proven practices for creating a robust network connection between an on-premises network and Azure. [Which should I choose?](./considerations.md) +These reference architectures show proven practices for creating a robust network connection between an on-premises network and Azure.
[Which should I choose?](./considerations.md)
+
    +
\ No newline at end of file From 217e9583f9e16497d862f1899137af0a75857907 Mon Sep 17 00:00:00 2001 From: Christopher Bennage Date: Tue, 20 Feb 2018 12:41:38 -0800 Subject: [PATCH 7/7] added some notes about building to the root readme --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 6b0aaef6897..dbc94016c2f 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,18 @@ Microsoft patterns & practices http://aka.ms/architecture +## Understanding the local build process + +Some of the markdown files are generated from data stored in json files. +This is primarily to avoid human error for pages that still require some HTML. +The process that converts the json to markdown uses a utility script located in the `build` folder. +To run the build script, navigate to the root folder of this repository. + +```bash +npm install +node .\build\build.js +``` + ## Legal Notices Microsoft and any contributors grant you a license to the Microsoft documentation and other content in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),