Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

additional css fixes for ref arch pages #418

Merged
merged 7 commits into from
Feb 20, 2018
+606 −346
Merged

additional css fixes for ref arch pages #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4c1182
moving content out of the template
bennage Feb 20, 2018
8f62b2c
adding app-service RAs
bennage Feb 20, 2018
8a05454
adding dmz
bennage Feb 20, 2018
184fbfb
hybrid networking
bennage Feb 20, 2018
77ed9d5
adding identity
bennage Feb 20, 2018
bcb91b8
adding vms
bennage Feb 20, 2018
217e958
added some notes about building to the root readme
bennage Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
10 changes: 8 additions & 2 deletions build/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
const formatIndex = require('./reference-architectures/index');
formatIndex();
const formatIndexFor = require('./reference-architectures/index');
formatIndexFor('.');
formatIndexFor('app-service-web-app');
formatIndexFor('dmz');
formatIndexFor('hybrid-networking');
formatIndexFor('identity');
formatIndexFor('virtual-machines-linux');
formatIndexFor('virtual-machines-windows');
4 changes: 2 additions & 2 deletions build/reference-architectures/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ const engine = Liquid({
extname: '.liquid'
});

module.exports = function () {
module.exports = function (indexFolder) {

const basePath = path.resolve(__dirname, `../../docs/reference-architectures/`);
const basePath = path.resolve(__dirname, `../../docs/reference-architectures/`, indexFolder);
const outputhPath = path.resolve(basePath, 'index.md');
const jsonPath = path.resolve(basePath, `index.json`);

Expand Down
12 changes: 7 additions & 5 deletions build/reference-architectures/templates/index.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 !!!
---
<!-- This file is generated! -->
<!-- See the templates in ./build/reference-architectures -->
<!-- See data in index.json -->

# 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 }}

<section class="series">
<ul class="panelContent">
Expand Down
25 changes: 25 additions & 0 deletions docs/reference-architectures/app-service-web-app/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"title": "App Service web application",
"description": "Recommended architectures for a web applications running in Microsoft Azure.",
"summary": "These reference architectures show proven practices for web applications that use Azure App Service and other managed services in Azure.",
"series": [
{
"title": "Basic web application",
"url": "./basic-web-app.md",
"image": "./images/basic-web-app.svg",
"summary": "A basic web application that uses Azure App Service and Azure SQL Database."
},
{
"title": "Improved scalability",
"url": "./scalable-web-app.md",
"image": "./images/scalable-web-app.svg",
"summary": "Improve scalability and performance by adding cache, CDN, and WebJobs for background tasks."
},
{
"title": "Run in multiple regions",
"url": "./multi-region.md",
"image": "./images/multi-region-web-app.svg",
"summary": "Run a web application in multiple regions to achieve high availability."
}
]
}
104 changes: 57 additions & 47 deletions docs/reference-architectures/app-service-web-app/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,78 @@ title: App Service web application
description: Recommended architectures for a web applications running in Microsoft Azure.
layout: LandingPage
---
<!-- This file is generated! -->
<!-- See the templates in ./build/reference-architectures -->
<!-- See data in index.json -->

# App Service web application

These reference architectures show proven practices for web applications that use Azure App Service and other managed services in Azure.

<ul class="panelContent">
<li>
<a href="./basic-web-app.md">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/basic-web-app.svg">
</div>
</div>
<div class="cardText">
<h3>Basic web application</h3>
<p>A basic web application that uses Azure App Service and Azure SQL Database.</p>
<section class="series">
<ul class="panelContent">
<!-- Basic web application -->
<li style="display: flex; flex-direction: column;">
<a href="./basic-web-app.md" style="display: flex; flex-direction: column; flex: 1 0 auto;">
<div class="cardSize" style="flex: 1 0 auto; display: flex;">
<div class="cardPadding" style="display: flex;">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/basic-web-app.svg" height="140px" />
</div>
</div>
<div class="cardText">
<h3>Basic web application</h3>
<p>A basic web application that uses Azure App Service and Azure SQL Database.</p>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="./scalable-web-app.md">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/scalable-web-app.svg">
</div>
</div>
<div class="cardText">
<h3>Improved scalability</h3>
<p>Improve scalability and performance by adding cache, CDN, and WebJobs for background tasks.</p>
</div>
</a>
</li>
<!-- Improved scalability -->
<li style="display: flex; flex-direction: column;">
<a href="./scalable-web-app.md" style="display: flex; flex-direction: column; flex: 1 0 auto;">
<div class="cardSize" style="flex: 1 0 auto; display: flex;">
<div class="cardPadding" style="display: flex;">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/scalable-web-app.svg" height="140px" />
</div>
</div>
<div class="cardText">
<h3>Improved scalability</h3>
<p>Improve scalability and performance by adding cache, CDN, and WebJobs for background tasks.</p>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="./multi-region.md">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/multi-region-web-app.svg">
</div>
</div>
<div class="cardText">
<h3>Run in multiple regions</h3>
<p>Run a web application in multiple regions to achieve high availability.</p>
</div>
</a>
</li>
<!-- Run in multiple regions -->
<li style="display: flex; flex-direction: column;">
<a href="./multi-region.md" style="display: flex; flex-direction: column; flex: 1 0 auto;">
<div class="cardSize" style="flex: 1 0 auto; display: flex;">
<div class="cardPadding" style="display: flex;">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/multi-region-web-app.svg" height="140px" />
</div>
</div>
<div class="cardText">
<h3>Run in multiple regions</h3>
<p>Run a web application in multiple regions to achieve high availability.</p>
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
</a>
</li>
</ul>
</section>

<ul class="panelContent cardsI">
</ul>
19 changes: 19 additions & 0 deletions docs/reference-architectures/dmz/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."
}
]
}
74 changes: 42 additions & 32 deletions docs/reference-architectures/dmz/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
<!-- This file is generated! -->
<!-- See the templates in ./build/reference-architectures -->
<!-- See data in index.json -->

# 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.

<ul class="panelContent">
<li>
<a href="./secure-vnet-hybrid.md">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/secure-vnet-hybrid.svg">
</div>
</div>
<div class="cardText">
<h3>DMZ between Azure and on-premises</h3>
<p>Implements a secure hybrid network that extends an on-premises network to Azure.</p>
<section class="series">
<ul class="panelContent">
<!-- DMZ between Azure and on-premises -->
<li style="display: flex; flex-direction: column;">
<a href="./secure-vnet-hybrid.md" style="display: flex; flex-direction: column; flex: 1 0 auto;">
<div class="cardSize" style="flex: 1 0 auto; display: flex;">
<div class="cardPadding" style="display: flex;">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/secure-vnet-hybrid.svg" height="140px" />
</div>
</div>
<div class="cardText">
<h3>DMZ between Azure and on-premises</h3>
<p>Implements a secure hybrid network that extends an on-premises network to Azure.</p>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="./secure-vnet-dmz.md">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/secure-vnet-dmz.svg">
</div>
</div>
<div class="cardText">
<h3>DMZ between Azure and the Internet</h3>
<p>Implements a secure network that accepts Internet traffic to Azure.</p>
</div>
</a>
</li>
<!-- DMZ between Azure and the Internet -->
<li style="display: flex; flex-direction: column;">
<a href="./secure-vnet-dmz.md" style="display: flex; flex-direction: column; flex: 1 0 auto;">
<div class="cardSize" style="flex: 1 0 auto; display: flex;">
<div class="cardPadding" style="display: flex;">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img src="./images/secure-vnet-dmz.svg" height="140px" />
</div>
</div>
<div class="cardText">
<h3>DMZ between Azure and the Internet</h3>
<p>Implements a secure network that accepts Internet traffic to Azure.</p>
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
</a>
</li>
</ul>
</section>

<ul class="panelContent cardsI">
</ul>
32 changes: 32 additions & 0 deletions docs/reference-architectures/hybrid-networking/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."
}
]
}

Loading