From 1fe4bd4300ea39d2f5da8af6b278e088f1be41d8 Mon Sep 17 00:00:00 2001 From: Jim Rigsbee <jimrigsbee@gmail.com> Date: Fri, 22 Mar 2019 17:34:34 +0100 Subject: [PATCH] Merge pull request #3 from rdebeasi/patch-1 --- exercises/1-the-manual-menace/README.md | 4 ++-- exercises/2-attack-of-the-pipelines/README.md | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/exercises/1-the-manual-menace/README.md b/exercises/1-the-manual-menace/README.md index e55f41d..670362c 100644 --- a/exercises/1-the-manual-menace/README.md +++ b/exercises/1-the-manual-menace/README.md @@ -330,7 +330,7 @@ Note - we would not normally make the project under your name but create a group and add the project there on residency but for simplicity of the exercise we'll do that here </p> --> -3. If you have not used Git before; you may need to tell Git who you are and what your email is before we commit. Run the following commands, substituting your email and "Your Name". If you've done this before move on to the next step. The last git config command is used to bypass SSL key verification for the GitLab server instance since we are using self-signed certificates on the sever. +3. If you have not used Git before; you may need to tell Git who you are and what your email is before we commit. Run the following commands, substituting your email and "Your Name". If you've done this before move on to the next step. The last git config command is used to bypass SSL key verification in this repo since we are using self-signed certificates on the GitLab sever. ```bash git config --global user.email "yourname@mail.com" @@ -340,7 +340,7 @@ ``` ```bash -git config --global http.sslVerify false +git config http.sslVerify false ``` 4. Commit your local project to this new remote by first removing the existing origin (github) where the Ansible project was cloned from in the first steps. Remember to substitute `<GIT_URL>` accordingly with the one created for your `enablement-ci-cd` repository a moment ago. diff --git a/exercises/2-attack-of-the-pipelines/README.md b/exercises/2-attack-of-the-pipelines/README.md index aabdd0e..3ce29a7 100644 --- a/exercises/2-attack-of-the-pipelines/README.md +++ b/exercises/2-attack-of-the-pipelines/README.md @@ -107,8 +107,9 @@ 2. Open up Gitlab and login. Create a new project (internal) in GitLab called `todolist-fe` to host your clone of the project and copy its remote address.  -3. In your local clone of the `todolist-fe`, remove the origin and add the GitLab origin by replacing `<YOUR_GIT_LAB_PROJECT>`. Push your app to GitLab +3. In your local clone of the `todolist-fe`, remove the origin and add the GitLab origin by replacing `<YOUR_GIT_LAB_PROJECT>`. Push your app to GitLab. (As before, we will bypass SSL key verification in this repo since we are using self-signed certificates on the GitLab sever.) ```bash +git config http.sslVerify false git remote set-url origin <YOUR_GIT_LAB_PROJECT> # verify the origin has been updated git remote -v @@ -244,8 +245,9 @@ 2. On GitLab; create a new project (internal) called `todolist-api` to host your clone of the project and copy its remote address as you did for the previous repositories. -3. In your local clone of the `todolist-api`, remove the origin and add the GitLab origin by replacing `<YOUR_GIT_LAB_PROJECT>`. Push your app to GitLab +3. In your local clone of the `todolist-api`, remove the origin and add the GitLab origin by replacing `<YOUR_GIT_LAB_PROJECT>`. Push your app to GitLab. (As before, we will bypass SSL key verification in this repo since we are using self-signed certificates on the GitLab sever.) ```bash +git config http.sslVerify false git remote set-url origin <YOUR_GIT_LAB_PROJECT> ``` ```bash -- Gitblit v1.9.3