align url directory for vpc paths

nginx/nginx.conf

@@ -51,6 +51,7 @@ http {
         rewrite ^/docs/security/threatmonitoring/alert-remediation-tips/ip-whitelist.html /docs/security/threatmonitoring/alert-remediation-tips/ip-allowlist.html permanent;
         rewrite ^/docs/operatingsystems/linux/mail/(.*)$ /docs/email/$1 permanent;
         rewrite ^/docs/operatingsystems/windows/hmail/antispamsetup.html /docs/email/hmail-antispam-setup.html permanent;
+        rewrite ^/docs/ecloud/ecloud-vpc/(.*)$ /docs/ecloud/vpc/$1 permanent;
 
         location /docs/robots.txt {
             alias /usr/share/nginx/docs.ukfast.co.uk/html/docs/_static/robots.txt;

source/_themes/ukf/layout.html

@@ -268,7 +268,7 @@ <h1 id="welcome-to-the-ukfast-documentation-centre">Welcome to the ANS Documenta
 		<i class="fa fa-cloud"></i>
 		<h2><a href="/docs/ecloud/">Cloud Technology</a></h2>
 		<ul>
-			<li><a href="/docs/ecloud/ecloud-vpc/">eCloud VPC</a></li>
+			<li><a href="/docs/ecloud/vpc/">eCloud VPC</a></li>
 			<li><a href="/docs/ecloud/private/">eCloud Private</a></li>
 			<li><a href="/docs/ecloud/public/">eCloud Public</a></li>
 			<li><a href="/docs/ecloud/vault/">eCloud Vault</a></li>

source/ecloud/index.rst

@@ -8,7 +8,7 @@ through to Private and Sovereign Cloud solutions.
 .. toctree::
    :maxdepth: 1
 
-   ecloud-vpc/index
+   vpc/index
    private/index
    public/index
    vault/index

source/ecloud/ecloud-vpc/cost-management/cost-management.md → source/ecloud/vpc/cost-management/cost-management.md

@@ -1,25 +1,25 @@
-# Cost Management
-This is the area where you can monitor and manage your spend on eCloud VPC as well as look at our pricing/calculator to predict spend before purchasing eCloud VPC
-
-## Calculator
-You can build your solution using our calculator to see what your costs would be at the PAYG rate before starting.
-
-By default the page will load with one VPC, if you are planning to have multiple VPCs you can add as many as you like with the add VPC button.
-
-## Spend Summary
-
-Your spend summary shows the total accumulated spend for the month, the estimation for the month and when your next billing date is (1st of the month). You will be able to cycle through the previous months in an upcoming update.
-Spend is broken down per VPC, this view collates all of your VPCs across all of your estate and is not filtered by region
-
-![Spend Summary](files/spend-summary.png)
-
-## Pricing
-If you need to check the price of anything quickly before you purchase you can do so on this page, each regions costs for each resource is defined by the hour and the average for a month also shown (730 hours). Currently all pricing for every region is the same.
-
-```eval_rst
-   .. title:: Cost Management
-   .. meta::
-      :title: Cost Management | ANS Documentation
-      :description: Managing your Spend with eCloud VPC
-      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Cost Management
+# Cost Management
+This is the area where you can monitor and manage your spend on eCloud VPC as well as look at our pricing/calculator to predict spend before purchasing eCloud VPC
+
+## Calculator
+You can build your solution using our calculator to see what your costs would be at the PAYG rate before starting.
+
+By default the page will load with one VPC, if you are planning to have multiple VPCs you can add as many as you like with the add VPC button.
+
+## Spend Summary
+
+Your spend summary shows the total accumulated spend for the month, the estimation for the month and when your next billing date is (1st of the month). You will be able to cycle through the previous months in an upcoming update.
+Spend is broken down per VPC, this view collates all of your VPCs across all of your estate and is not filtered by region
+
+![Spend Summary](files/spend-summary.png)
+
+## Pricing
+If you need to check the price of anything quickly before you purchase you can do so on this page, each regions costs for each resource is defined by the hour and the average for a month also shown (730 hours). Currently all pricing for every region is the same.
+
+```eval_rst
+   .. title:: Cost Management
+   .. meta::
+      :title: Cost Management | ANS Documentation
+      :description: Managing your Spend with eCloud VPC
+      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Cost Management
 ```

source/ecloud/ecloud-vpc/cost-management/discount-plans.md → source/ecloud/vpc/cost-management/discount-plans.md

@@ -1,36 +1,36 @@
-# Discount Plans
-Discount Plans are designed to reduce your spend for committing to a 12, 24 or 36 month term for your eCloud VPC resources. These discount plans are applied across all of your VPC spending, and are not tied to any specific resources. Therefore, you are not locked into specific items, giving you the freedom to upgrade, downgrade or try to sell a resource.
-
-## Create
-To add a discount plan, you need to know the estimated amount of pay-and-go spend of your environment(s). To do this, you can use the calculator, or if you are already using eCloud VPC then you can see your estimations from the spend summary page. Keep in mind though that may only show partial months.
-
-Set your commitment minimum spend (this is the pay-as-you-go amount you are estimating), the minimum term, and when you would like the plan to start.
-
-The form then shows you what you can use (your PAYG amount) before additional charges will be incurred, and the cost for your PAYG amount.
-
-It is possible to have as many Discount Plans as you need.
-
-**Example 1:**
-
-You estimate your PAYG spend to be £13,500 a month, and you wish to commit to a 36 month term to benefit from the maximum discount, which works out at a spend of £10,800.
-
-At the end of the first month you are using £15,625 of eCloud VPC resources.
-
-£13,500 of the above £15,625 is charged at £10,800 and then you are charged the standard PAYG rate for everything above £13,500 which is £2,125. Your total bill is therefore £10,800 + £2,125 = £12,925
-
-**Example 2:**
-
-You estimate your PAYG spend to be £13,500 a month, and you wish to commit to a 36 month term to benefit from the maximum discount, which works out at a spend of £10,800.
-
-At the end of the first month, you are using £13,000 of eCloud VPC resources.
-
-Your PAYG spend is not therefore above the £13,500, so there would be no additional costs above the £10,800.
-
-
-```eval_rst
-   .. title:: Discount Plans
-   .. meta::
-      :title: Discount Plans | ANS Documentation
-      :description: Managing your Discount Plans
-      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Discount Plans, Spend
+# Discount Plans
+Discount Plans are designed to reduce your spend for committing to a 12, 24 or 36 month term for your eCloud VPC resources. These discount plans are applied across all of your VPC spending, and are not tied to any specific resources. Therefore, you are not locked into specific items, giving you the freedom to upgrade, downgrade or try to sell a resource.
+
+## Create
+To add a discount plan, you need to know the estimated amount of pay-and-go spend of your environment(s). To do this, you can use the calculator, or if you are already using eCloud VPC then you can see your estimations from the spend summary page. Keep in mind though that may only show partial months.
+
+Set your commitment minimum spend (this is the pay-as-you-go amount you are estimating), the minimum term, and when you would like the plan to start.
+
+The form then shows you what you can use (your PAYG amount) before additional charges will be incurred, and the cost for your PAYG amount.
+
+It is possible to have as many Discount Plans as you need.
+
+**Example 1:**
+
+You estimate your PAYG spend to be £13,500 a month, and you wish to commit to a 36 month term to benefit from the maximum discount, which works out at a spend of £10,800.
+
+At the end of the first month you are using £15,625 of eCloud VPC resources.
+
+£13,500 of the above £15,625 is charged at £10,800 and then you are charged the standard PAYG rate for everything above £13,500 which is £2,125. Your total bill is therefore £10,800 + £2,125 = £12,925
+
+**Example 2:**
+
+You estimate your PAYG spend to be £13,500 a month, and you wish to commit to a 36 month term to benefit from the maximum discount, which works out at a spend of £10,800.
+
+At the end of the first month, you are using £13,000 of eCloud VPC resources.
+
+Your PAYG spend is not therefore above the £13,500, so there would be no additional costs above the £10,800.
+
+
+```eval_rst
+   .. title:: Discount Plans
+   .. meta::
+      :title: Discount Plans | ANS Documentation
+      :description: Managing your Discount Plans
+      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Discount Plans, Spend
 ```

source/ecloud/ecloud-vpc/firewall-policies.md → source/ecloud/vpc/firewall-policies.md

@@ -1,42 +1,42 @@
-# Firewall Policies (North-South Firewalling)
-See Network Policies for East-West Firewalling (between network segments).
-
-This section relates to the policies and rules for north-south firewall traffic (e.g. from the router to some other destination such as the internet or another router within eCloud VPC)
-
-### How Firewall Policies work
-Firewall policies are applied on the router, the policies are applied in order from the top down and the rules within the policies in the order they appear too (top down also). Each rule is checked and once a rule is found to match the criteria, this rule is applied with no further checks being carried out. If none of the rules' criteria is matched then the default 'drop' rule is applied to the packet.
-
-If you have advanced networking, you may also need to add the corresponding rules in the network policy section (which are applied at the NIC level of the Instance rather than at the router like here).
-
-### Creating your Firewall Policies
-
-To get started, you need to create a policy within the router you wish the rules to be applied to. Note that in most cases users would have default rules created for them on VPC creation, if you did not then you still have the option when there are no policies created:
-
-![Firewall Policies](files/firewall-policies.png)
-
-### Create a policy - set the name for your first policy and hit the create button.
-
-![Firewall Policies](files/firewall-policies-create.png)
-
-### Add some rules to your policy
-
-Set the details of your rule, at the minute you cannot reorder rules so you need to add them in the order in which they are to be checked, or alternatively add 1 rule per policy and then you can reorder everything using the policies.
-
-![Firewall Policies](files/firewall-policies-rules-create.png)
-
-![Firewall Policies](files/firewall-policies-example.png)
-
-Add further policies & rules as you need.
-
-![Firewall Policies](files/firewall-policies-example2.png)
-
-### Ordering of firewall rules
-Press the up or down arrows on the left hand side of the policy name to change the order in which the policies are applied.
-
-```eval_rst
-   .. title:: Firewall Policies
-   .. meta::
-      :title: Firewall Policies | ANS Documentation
-      :description: Managing your firewall policies and rules
-      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Instances, Firewall
-```
+# Firewall Policies (North-South Firewalling)
+See Network Policies for East-West Firewalling (between network segments).
+
+This section relates to the policies and rules for north-south firewall traffic (e.g. from the router to some other destination such as the internet or another router within eCloud VPC)
+
+### How Firewall Policies work
+Firewall policies are applied on the router, the policies are applied in order from the top down and the rules within the policies in the order they appear too (top down also). Each rule is checked and once a rule is found to match the criteria, this rule is applied with no further checks being carried out. If none of the rules' criteria is matched then the default 'drop' rule is applied to the packet.
+
+If you have advanced networking, you may also need to add the corresponding rules in the network policy section (which are applied at the NIC level of the Instance rather than at the router like here).
+
+### Creating your Firewall Policies
+
+To get started, you need to create a policy within the router you wish the rules to be applied to. Note that in most cases users would have default rules created for them on VPC creation, if you did not then you still have the option when there are no policies created:
+
+![Firewall Policies](files/firewall-policies.png)
+
+### Create a policy - set the name for your first policy and hit the create button.
+
+![Firewall Policies](files/firewall-policies-create.png)
+
+### Add some rules to your policy
+
+Set the details of your rule, at the minute you cannot reorder rules so you need to add them in the order in which they are to be checked, or alternatively add 1 rule per policy and then you can reorder everything using the policies.
+
+![Firewall Policies](files/firewall-policies-rules-create.png)
+
+![Firewall Policies](files/firewall-policies-example.png)
+
+Add further policies & rules as you need.
+
+![Firewall Policies](files/firewall-policies-example2.png)
+
+### Ordering of firewall rules
+Press the up or down arrows on the left hand side of the policy name to change the order in which the policies are applied.
+
+```eval_rst
+   .. title:: Firewall Policies
+   .. meta::
+      :title: Firewall Policies | ANS Documentation
+      :description: Managing your firewall policies and rules
+      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Instances, Firewall
+```

source/ecloud/ecloud-vpc/floating-ip.md → source/ecloud/vpc/floating-ip.md

@@ -1,36 +1,36 @@
-# Floating IPs
-A Floating IP is public IP address that is used by a resource to route out to the internet
-
-### How does a Floating IP work
-You can add a floating IP to your VPC and not attach it to anything or you can attach it to a resource, by attaching it to a resource (e.g. an instance) then we create a NAT rule between the public and private address (of the resource you attached it to).
-
-
-##  Add a Floating IP to an Instance
-
-There are two ways to add a floating IP to an instance;
-
-1)	To add an Floating (public) IP address to your VPC, press the Request Floating IP button. You can assign Floating IPs directly to Instances via the instance launch page
-![Floating IP](files/floating-ip-empty.png)
-
-You should see the following banner whilst it deals with the request
-![Floating IP](files/floating-ip-requested-banner.png)
-
-With the IP then available, but not assigned to anything, remember that any floating IP that is not assigned to a resource will still be charged at the rate for that availability zone
-![Floating IP](files/floating-ip-launched.png)
-
-When building your instance, you can then select from the available IPs;
-![Floating IP](files/floating-ip-assign-instance.png)
-
-### Delete a Floating IP
-Press the trash icon on the floating IP card to delete it, it will only allow you to delete IPs that are not assigned to a resource.
-
-
-
-
-```eval_rst
-   .. title:: Floating IP
-   .. meta::
-      :title: Floating IP | ANS Documentation
-      :description: Managing Floating IPs
-      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Floating IP
+# Floating IPs
+A Floating IP is public IP address that is used by a resource to route out to the internet
+
+### How does a Floating IP work
+You can add a floating IP to your VPC and not attach it to anything or you can attach it to a resource, by attaching it to a resource (e.g. an instance) then we create a NAT rule between the public and private address (of the resource you attached it to).
+
+
+##  Add a Floating IP to an Instance
+
+There are two ways to add a floating IP to an instance;
+
+1)	To add an Floating (public) IP address to your VPC, press the Request Floating IP button. You can assign Floating IPs directly to Instances via the instance launch page
+![Floating IP](files/floating-ip-empty.png)
+
+You should see the following banner whilst it deals with the request
+![Floating IP](files/floating-ip-requested-banner.png)
+
+With the IP then available, but not assigned to anything, remember that any floating IP that is not assigned to a resource will still be charged at the rate for that availability zone
+![Floating IP](files/floating-ip-launched.png)
+
+When building your instance, you can then select from the available IPs;
+![Floating IP](files/floating-ip-assign-instance.png)
+
+### Delete a Floating IP
+Press the trash icon on the floating IP card to delete it, it will only allow you to delete IPs that are not assigned to a resource.
+
+
+
+
+```eval_rst
+   .. title:: Floating IP
+   .. meta::
+      :title: Floating IP | ANS Documentation
+      :description: Managing Floating IPs
+      :keywords: ecloud, ecloud VPC, ANS Portal, VPC, Virtual Private Cloud, Floating IP
 ```