Skip to content

M
mooc-rr-ressources
Commit 53f7a2c4 authored by Arnaud Legrand's avatar Arnaud Legrand
Browse files
Options

Minor typos plus link to the MOOC videos (rather than youtube ones)

parent 1ad32506
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 65 deletions
module2/ressources/gitlab.html
View file @ 53f7a2c4
......@@ -4,24 +4,24 @@
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#org65282e3">Installing Git</a>
<li style="margin-bottom:0;"><a href="#orge3f4bc8">Installing Git</a>
<ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#orgfbf6964">Linux (debian, ubuntu)</a></li>
<li style="margin-bottom:0;"><a href="#orgb9333af">Mac OSX and Windows</a></li>
<li style="margin-bottom:0;"><a href="#orgf47f6c9">Linux (debian, ubuntu)</a></li>
<li style="margin-bottom:0;"><a href="#org6c4b10f">Mac OSX and Windows</a></li>
</ul>
</li>
<li style="margin-bottom:0;"><a href="#orgc0ecb74">Authenticating on GitLab</a>
<li style="margin-bottom:0;"><a href="#orgca31098">Authenticating on GitLab</a>
<ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#org368a2a9">Option 1: HTTPS</a>
<li style="margin-bottom:0;"><a href="#org69e4843">Option 1: HTTPS</a>
<ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#orgadea060">Configuring your GitLab password</a></li>
<li style="margin-bottom:0;"><a href="#orgd0479e2">Making sure git remembers your password</a></li>
<li style="margin-bottom:0;"><a href="#org4c05db5">Configuring your GitLab password</a></li>
<li style="margin-bottom:0;"><a href="#orgcfbd789">Making sure git remembers your password</a></li>
</ul>
</li>
<li style="margin-bottom:0;"><a href="#org572d681">Option 2: SSH</a>
<li style="margin-bottom:0;"><a href="#orgaa173db">Option 2: SSH</a>
<ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#orge91383b">Installing SSH</a></li>
<li style="margin-bottom:0;"><a href="#org0dfb09b">Setting up SSH on Framagit</a></li>
<li style="margin-bottom:0;"><a href="#org880f8ce">Installing SSH</a></li>
<li style="margin-bottom:0;"><a href="#org4481e63">Setting up SSH on GitLab</a></li>
</ul>
</li>
</ul>
......@@ -47,18 +47,22 @@ is very convenient but in most cases, you will want to have your own
local copy of the repository and you will have to synchronize your
local copy with the remote GitLab one. To propagate your
modifications, you will obviously have to authenticate yourself on
GitLab. This document describes the software you need to have
installed on your machine and how to handle authentification. Please
read these instructions carefully.
GitLab. How to do this is illustrated in a <a href="https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/f6580ad8e997400faeffe9af4fd37063/2">video tutorial</a> (in French).
</p>
<div id="outline-container-org65282e3" class="outline-2">
<h2 id="org65282e3">Installing Git</h2>
<div class="outline-text-2" id="text-org65282e3">
<p>
This document describes the software you need to have
installed on your machine and how to handle authentication. Please
read these instructions carefully.
</p>
<div id="outline-container-orge3f4bc8" class="outline-2">
<h2 id="orge3f4bc8">Installing Git</h2>
<div class="outline-text-2" id="text-orge3f4bc8">
</div>
<div id="outline-container-orgfbf6964" class="outline-3">
<h3 id="orgfbf6964">Linux (debian, ubuntu)</h3>
<div class="outline-text-3" id="text-orgfbf6964">
<div id="outline-container-orgf47f6c9" class="outline-3">
<h3 id="orgf47f6c9">Linux (debian, ubuntu)</h3>
<div class="outline-text-3" id="text-orgf47f6c9">
<p>
We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information
......@@ -74,9 +78,9 @@ Run (as root):
</div>
</div>
</div>
<div id="outline-container-orgb9333af" class="outline-3">
<h3 id="orgb9333af">Mac OSX and Windows</h3>
<div class="outline-text-3" id="text-orgb9333af">
<div id="outline-container-org6c4b10f" class="outline-3">
<h3 id="org6c4b10f">Mac OSX and Windows</h3>
<div class="outline-text-3" id="text-org6c4b10f">
<ul class="org-ul">
<li style="margin-bottom:0;">Download and install Git from the <a href="https://git-scm.com/downloads">Git website</a>.</li>
<li style="margin-bottom:0;">Optional Git clients (should not be needed if you work within
......@@ -96,9 +100,9 @@ Rstudio):
</div>
</div>
</div>
<div id="outline-container-orgc0ecb74" class="outline-2">
<h2 id="orgc0ecb74">Authenticating on GitLab</h2>
<div class="outline-text-2" id="text-orgc0ecb74">
<div id="outline-container-orgca31098" class="outline-2">
<h2 id="orgca31098">Authenticating on GitLab</h2>
<div class="outline-text-2" id="text-orgca31098">
<p>
There are two ways of authenticating and synchronizing your local
repository with GitLab: through HTTPS or through SSH. The first one
......@@ -109,26 +113,22 @@ never asks me for any password anymore and I don't have to remember
anything).
</p>
</div>
<div id="outline-container-org368a2a9" class="outline-3">
<h3 id="org368a2a9">Option 1: HTTPS</h3>
<div class="outline-text-3" id="text-org368a2a9">
<div id="outline-container-org69e4843" class="outline-3">
<h3 id="org69e4843">Option 1: HTTPS</h3>
<div class="outline-text-3" id="text-org69e4843">
</div>
<div id="outline-container-orgadea060" class="outline-4">
<h4 id="orgadea060">Configuring your GitLab password</h4>
<div class="outline-text-4" id="text-orgadea060">
<div id="outline-container-org4c05db5" class="outline-4">
<h4 id="org4c05db5">Configuring your GitLab password</h4>
<div class="outline-text-4" id="text-org4c05db5">
<p>
In this video, I explain how to change your password on our GitLab.
In this <a href="https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/f6580ad8e997400faeffe9af4fd37063/2">video tutorial</a> (in French), I explain how to change your
password on our GitLab.
</p>
<div class="org-center">
<p>
Youtube Video
</p>
</div>
</div>
</div>
<div id="outline-container-orgd0479e2" class="outline-4">
<h4 id="orgd0479e2">Making sure git remembers your password</h4>
<div class="outline-text-4" id="text-orgd0479e2">
<div id="outline-container-orgcfbd789" class="outline-4">
<h4 id="orgcfbd789">Making sure git remembers your password</h4>
<div class="outline-text-4" id="text-orgcfbd789">
<p>
My GitLab id is <code>3211ac4f2fb71deaeff9252764c368e7</code>. Say I've configured
my password to be <code>tototutu</code> (what a weak password&#x2026;) and I want to
......@@ -168,23 +168,23 @@ cached in memory and they will not be asked again before an hour.
</div>
</div>
</div>
<div id="outline-container-org572d681" class="outline-3">
<h3 id="org572d681">Option 2: SSH</h3>
<div class="outline-text-3" id="text-org572d681">
<div id="outline-container-orgaa173db" class="outline-3">
<h3 id="orgaa173db">Option 2: SSH</h3>
<div class="outline-text-3" id="text-orgaa173db">
<p>
My prefered (although more technical) solution is to install SSH, to
My preferred (although more technical) solution is to install SSH, to
create a pair or private/public keys, and to upload your SSH public
key on GitLab. This section provides with information on how to do
this.
</p>
</div>
<div id="outline-container-orge91383b" class="outline-4">
<h4 id="orge91383b">Installing SSH</h4>
<div class="outline-text-4" id="text-orge91383b">
<div id="outline-container-org880f8ce" class="outline-4">
<h4 id="org880f8ce">Installing SSH</h4>
<div class="outline-text-4" id="text-org880f8ce">
</div>
<ul class="org-ul">
<li style="margin-bottom:0;"><a id="orgebe8852"></a>Linux (debian, ubuntu)<br />
<div class="outline-text-5" id="text-orgebe8852">
<li style="margin-bottom:0;"><a id="orga22af4e"></a>Linux (debian, ubuntu)<br />
<div class="outline-text-5" id="text-orga22af4e">
<p>
We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information
......@@ -200,15 +200,15 @@ Run (as root):
</div>
</div>
</li>
<li style="margin-bottom:0;"><a id="orgd6eebe7"></a>Mac OSX<br />
<div class="outline-text-5" id="text-orgd6eebe7">
<li style="margin-bottom:0;"><a id="orgdea2c28"></a>Mac OSX<br />
<div class="outline-text-5" id="text-orgdea2c28">
<p>
You do not have anything to do as it is installed by default.
</p>
</div>
</li>
<li style="margin-bottom:0;"><a id="orgf3737c4"></a>Windows<br />
<div class="outline-text-5" id="text-orgf3737c4">
<li style="margin-bottom:0;"><a id="org991d2af"></a>Windows<br />
<div class="outline-text-5" id="text-org991d2af">
<p>
You should install the <a href="https://www.ssh.com/ssh/putty/windows/">Putty</a> client. Once it is installed, look for
the section on <a href="https://www.ssh.com/ssh/putty/windows/puttygen">generating an SSH key</a>.
......@@ -217,9 +217,9 @@ the section on <a href="https://www.ssh.com/ssh/putty/windows/puttygen">generati
</li>
</ul>
</div>
<div id="outline-container-org0dfb09b" class="outline-4">
<h4 id="org0dfb09b">Setting up SSH on Framagit</h4>
<div class="outline-text-4" id="text-org0dfb09b">
<div id="outline-container-org4481e63" class="outline-4">
<h4 id="org4481e63">Setting up SSH on GitLab</h4>
<div class="outline-text-4" id="text-org4481e63">
<p>
Here are <a href="https://docs.gitlab.com/ee/ssh/">all the official explanations on how to set up your SSH key
on GitLab</a>. Alternatively, you may also want to have a look at this
......
module2/ressources/gitlab.org
View file @ 53f7a2c4
......@@ -19,9 +19,11 @@ is very convenient but in most cases, you will want to have your own
local copy of the repository and you will have to synchronize your
local copy with the remote GitLab one. To propagate your
modifications, you will obviously have to authenticate yourself on
GitLab. This document describes the software you need to have
installed on your machine and how to handle authentification. Please
read these instructions carefully.
GitLab. How to do this is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/f6580ad8e997400faeffe9af4fd37063/2][video tutorial]] (in French).
This document describes the software you need to have
installed on your machine and how to handle authentication. Please
read these instructions carefully.
* Installing Git
** Linux (debian, ubuntu)
......@@ -52,10 +54,8 @@ never asks me for any password anymore and I don't have to remember
anything).
** Option 1: HTTPS
*** Configuring your GitLab password
In this video, I explain how to change your password on our GitLab.
#+BEGIN_CENTER
Youtube Video
#+END_CENTER
In this [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/f6580ad8e997400faeffe9af4fd37063/2][video tutorial]] (in French), I explain how to change your
password on our GitLab.
*** Making sure git remembers your password
My GitLab id is =3211ac4f2fb71deaeff9252764c368e7=. Say I've configured
my password to be =tototutu= (what a weak password...) and I want to
......@@ -83,7 +83,7 @@ git config --global credential.helper "cache --timeout=3600" # for one hour at m
With this setup, you will be prompted for your password but it will be
cached in memory and they will not be asked again before an hour.
** Option 2: SSH
My prefered (although more technical) solution is to install SSH, to
My preferred (although more technical) solution is to install SSH, to
create a pair or private/public keys, and to upload your SSH public
key on GitLab. This section provides with information on how to do
this.
......@@ -102,7 +102,7 @@ You do not have anything to do as it is installed by default.
**** Windows
You should install the [[https://www.ssh.com/ssh/putty/windows/][Putty]] client. Once it is installed, look for
the section on [[https://www.ssh.com/ssh/putty/windows/puttygen][generating an SSH key]].
*** Setting up SSH on Framagit
*** Setting up SSH on GitLab
Here are [[https://docs.gitlab.com/ee/ssh/][all the official explanations on how to set up your SSH key
on GitLab]]. Alternatively, you may also want to have a look at this
video:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment