Merge branch 'BULL-324' into 'master'

removed pen testing

See merge request platform-one/private/bullhorn/platform1-site!144

src/views/Services.vue

@@ -37,23 +37,27 @@
             </ul>
           </div>
         </div>
-
         <div class="col-lg-5">
-          <h4>PLATFORM ONE <br />CYBERSECURITY/PEN-TESTING SERVICES</h4>
+          <h4>CLOUD NATIVE ACCESS POINT (CNAP)</h4>
           <div class="pl-4 pr-16">
             <ul>
               <li>
-                Ability to pen-test a DevSecOps environment at various
-                classification levels (pay per use)
+                The Cloud Native Acess Point is available on Cloud One to
+                provide access to Development, Testing, and Production enclaves
+                at IL-2, IL-4, and IL-5 that use Platform One DevSecOps
+                environments by using an internet-facing Cloud-native Zero
               </li>
+              <!-- <li>
+              CNAP diagram <a href="TODO/somewhere" target="_blank">here</a>
+            </li> -->
               <li>
                 To learn more about these capabilities, please contact
                 <a
-                  href="mailto:af.cso@us.af.mil?subject=Platform One Pen-testing Options Question"
+                  href="mailto:af.cso@us.af.mil?subject=Platform One CNAP Question"
                 >
                   af.cso@us.af.mil
                 </a>
-                with Subject: "Platform One Pen-testing Options Question"
+                with Subject: "Platform One CNAP Question"
               </li>
             </ul>
           </div>
@@ -90,27 +94,37 @@
             </ul>
           </div>
         </div>
-        <div class="col-lg-5">
-          <h4>CLOUD NATIVE ACCESS POINT (CNAP)</h4>
+        <div class="col-lg-6">
+          <h4>PLATFORM ONE DEVSECOPS MANAGED TOOLS</h4>
           <div class="pl-4 pr-16">
             <ul>
               <li>
-                The Cloud Native Acess Point is available on Cloud One to
-                provide access to Development, Testing, and Production enclaves
-                at IL-2, IL-4, and IL-5 that use Platform One DevSecOps
-                environments by using an internet-facing Cloud-native Zero
+                Platform One Enterprise Chat provides a collaboration solutions
+                suitable for connecting developer teams (pay per use): IL-4
+                (.mil email only)
+                <ExternalLink inline href="https://chat.collab.cdl.af.mil">
+                  https://chat.collab.cdl.af.mil
+                </ExternalLink>
+              </li>
+              <li>
+                Platform One ABMS All Domain Common Environment (pay per use)
+              </li>
+              <li>
+                Platform One Multi-Level Security Data Transfer (CDS/Diode) (pay
+                per use)
+              </li>
+              <li>
+                Platform One Stack Exchange: knowledge sharing service for
+                software developers and engineers (pay per use)
               </li>
-              <!-- <li>
-              CNAP diagram <a href="TODO/somewhere" target="_blank">here</a>
-            </li> -->
               <li>
                 To learn more about these capabilities, please contact
                 <a
-                  href="mailto:af.cso@us.af.mil?subject=Platform One CNAP Question"
+                  href="mailto:af.cso@us.af.mil?subject=Platform One Managed Tools Question"
                 >
                   af.cso@us.af.mil
                 </a>
-                with Subject: "Platform One CNAP Question"
+                with Subject: "Platform One Managed Tools Question"
               </li>
             </ul>
           </div>
@@ -179,41 +193,6 @@
             </ul>
           </div>
         </div>
-        <div class="col-lg-5">
-          <h4>PLATFORM ONE DEVSECOPS MANAGED TOOLS</h4>
-          <div class="pl-4 pr-16">
-            <ul>
-              <li>
-                Platform One Enterprise Chat provides a collaboration solutions
-                suitable for connecting developer teams (pay per use): IL-4
-                (.mil email only)
-                <ExternalLink inline href="https://chat.collab.cdl.af.mil">
-                  https://chat.collab.cdl.af.mil
-                </ExternalLink>
-              </li>
-              <li>
-                Platform One ABMS All Domain Common Environment (pay per use)
-              </li>
-              <li>
-                Platform One Multi-Level Security Data Transfer (CDS/Diode) (pay
-                per use)
-              </li>
-              <li>
-                Platform One Stack Exchange: knowledge sharing service for
-                software developers and engineers (pay per use)
-              </li>
-              <li>
-                To learn more about these capabilities, please contact
-                <a
-                  href="mailto:af.cso@us.af.mil?subject=Platform One Managed Tools Question"
-                >
-                  af.cso@us.af.mil
-                </a>
-                with Subject: "Platform One Managed Tools Question"
-              </li>
-            </ul>
-          </div>
-        </div>
       </div>
     </div>
   </div>
@@ -224,7 +203,7 @@ import ExternalLink from "@/components/ExternalLink";
 
 export default {
   name: "Services",
-  components: { PageHeader, ExternalLink }
+  components: { PageHeader, ExternalLink },
 };
 </script>
 <style lang="scss" scoped>