From da9923d782dd01e02047e58c2d44f54b0418c90b Mon Sep 17 00:00:00 2001
From: donal <donalspring@gmail.com>
Date: Sun, 22 Apr 2018 23:05:14 +0200
Subject: [PATCH] Fix url

---
 exercises/5-non-functionals-strike-back/README.md |    4 ++--
 exercises/4-an-enslaved-hope/README.md            |   18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/exercises/4-an-enslaved-hope/README.md b/exercises/4-an-enslaved-hope/README.md
index 2a883f8..5de021d 100644
--- a/exercises/4-an-enslaved-hope/README.md
+++ b/exercises/4-an-enslaved-hope/README.md
@@ -230,14 +230,14 @@
 
 3. This should have created the following files:
     - `templates/jenkins-slave-generic-template.yml`
-    - `params/zap-build-pod` and `params/arachni-build-pod`
+    - `params/jenkins-slave-zap` and `params/jenkins-slave-arachni`
 
-3. Create an object in `inventory/host_vars/ci-cd-tooling.yml` called `zap-build-pod` and add the following content:
+3. Create an object in `inventory/host_vars/ci-cd-tooling.yml` called `jenkins-slave-zap` and add the following content:
 ```yaml
-    - name: "zap-build-pod"
+    - name: "jenkins-slave-zap"
       namespace: "{{ ci_cd_namespace }}"
       template: "{{ playbook_dir }}/templates/jenkins-slave-generic-template.yml"
-      params: "{{ playbook_dir }}/params/zap-build-pod"
+      params: "{{ playbook_dir }}/params/jenkins-slave-zap"
       tags:
       - zap
 ```
@@ -255,18 +255,18 @@
      -e "filter_tags=zap"
 ```
 
-3. Head to (https://console.somedomain.com/console/project/<YOUR_NAME>-ci-cd/browse/builds) on Openshift and you should see `zap-build-pod`.
+3. Head to (https://console.somedomain.com/console/project/<YOUR_NAME>-ci-cd/browse/builds) on Openshift and you should see `jenkins-slave-zap`.
 include screenshot here.
 
 #### Part 3b - Arachni Scan
 > _Arachni is a feature-full, modular, high-performance Ruby framework aimed towards helping penetration testers and administrators evaluate the security of web applications._
 
-3. Create an object in `inventory/host_vars/ci-cd-tooling.yml` called `arachni-build-pod` with the following content:
+3. Create an object in `inventory/host_vars/ci-cd-tooling.yml` called `jenkins-slave-arachni` with the following content:
 ```yaml
-    - name: "arachni-build-pod"
+    - name: "jenkins-slave-arachni"
       namespace: "{{ ci_cd_namespace }}"
       template: "{{ playbook_dir }}/templates/jenkins-slave-generic-template.yml"
-      params: "{{ playbook_dir }}/params/arachni-build-pod"
+      params: "{{ playbook_dir }}/params/jenkins-slave-arachni"
       tags:
       - arachni
 ```
@@ -278,7 +278,7 @@
      -e "filter_tags=arachni"
 ```
 
-3. Head to (https://console.somedomain.com/console/project/<YOUR_NAME>-ci-cd/browse/builds) on Openshift and you should see `arachni-build-pod`.
+3. Head to (https://console.somedomain.com/console/project/<YOUR_NAME>-ci-cd/browse/builds) on Openshift and you should see `jenkins-slave-arachni`.
 ![todolist-fe-multi](../images/exercise4/builds-zap-arachni.png)
 
 _____
diff --git a/exercises/5-non-functionals-strike-back/README.md b/exercises/5-non-functionals-strike-back/README.md
index 6ca0488..7544903 100644
--- a/exercises/5-non-functionals-strike-back/README.md
+++ b/exercises/5-non-functionals-strike-back/README.md
@@ -104,7 +104,7 @@
     }
     steps {
         sh '''
-            /zap/zap-baseline.py -r index.html -t ${E2E_TEST_ROUTE}
+            /zap/zap-baseline.py -r index.html -t http://${E2E_TEST_ROUTE}
             exit $?
         '''
     }
@@ -137,7 +137,7 @@
         }
         steps {
             sh '''
-                /arachni/bin/arachni ${E2E_TEST_ROUTE} --report-save-path=arachni-report.afr
+                /arachni/bin/arachni http://${E2E_TEST_ROUTE} --report-save-path=arachni-report.afr
                 /arachni/bin/arachni_reporter arachni-report.afr --reporter=xunit:outfile=report.xml --reporter=html:outfile=web-report.zip
                 unzip web-report.zip -d arachni-web-report
             '''

--
Gitblit v1.9.3