Skip to content
Snippets Groups Projects
Commit b9da571d authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

Merge branch 'develop' into 'master'

[release] Regular merge of develop

Closes #80

See merge request R3/howto-cards!504
parents 77404055 fc7e5965
No related branches found
No related tags found
No related merge requests found
Showing
with 108 additions and 49 deletions
File moved
......@@ -109,7 +109,7 @@ build:pages:
- |
echo "Configuration: " && cat ".ci/_config_$CI_COMMIT_REF_NAME.yml"
# Run Jekyll with custom configuration
- LOGFILE=/dev/stdout ./add-timestamp-to-howtocard.sh external
- LOGFILE=/dev/stdout .ci/add-timestamp-to-howtocard.sh external
- bundle exec jekyll build -d build --config "_config.yml,.ci/_config_$CI_COMMIT_REF_NAME.yml"
# check
......
......@@ -56,6 +56,7 @@ order: -1
<li><a href="{{ 'external/contribute/markdown' | relative_url }}">Markdown</a></li>
<li><a href="{{ 'external/contribute/mirror-fork' | relative_url }}">Mirror fork automatically</a></li>
<li><a href="{{ 'external/contribute/review' | relative_url }}">Reviewing in Git</a></li>
<li><a href="{{ 'external/contribute/supersede' | relative_url }}">Take over a stale merge request</a></li>
<li><a href="{{ 'external/contribute/vscode' | relative_url }}">Contribute using Visual Studio Code</a></li>
<li><a href="{{ 'external/contribute/web-ide' | relative_url }}">Contribute using Gitlab Web IDE</a></li>
......
---
card_order: 400
layout: page
permalink: /external/access/vpn-access/
shortcut: access:vpn-access
redirect_from:
- /cards/access:vpn-access
- /external/cards/access:vpn-access
- /access/vpn-access
- /external/external/access/vpn-access/
---
# VPN connection
VPN is used to access the servers that are hosted at the LCSB, but are not reachable "externally" from the internet, such as the [pre-publication check page](https://publications.lcsb.uni.lu) and the internal version of the [How-To cards](https://howto.lcsb.uni.lu). VPN uses the same user login information as the university active directory account (i.e., the same as used for Fiori, ServiceNow and Outlook e-mail), and is available automatically for all employees.
## Download and start the VPN
Once you have reset your VPN Password, please download VPN client from [VPN](https://vpn.uni.lu/)
**ENTER**
1. Username - firstname.lastname
2. Password - Password you have set for VPN
**Note**- If firstname.lastname does not work, give a try with firstname.lastname@uni.lu
<img src="img/vpn-download.png" height="300px"><br/>
Then depending on your distribution of OS, it will suggest you a link to download.
<img src="img/vpn-download-01.png" height="300px"><br/>
external/access/vpn-cerbere-access/img/password-reset-vpn-01.png

29.3 KiB

external/access/vpn-cerbere-access/img/password-reset-vpn-02.png

30.1 KiB

external/access/vpn-cerbere-access/img/password-reset-vpn.png

30 KiB

---
card_order: 400
card_order: 420
layout: page
permalink: /external/access/vpn-cerbere-access/
shortcut: access:vpn-cerbere-access
......@@ -9,48 +9,10 @@ redirect_from:
- /access/vpn-cerbere-access
- /external/external/access/vpn-cerbere-access/
---
# VPN/CERBERE connection
In addition to the LCSB account, external collaborators are provided with VPN account so that they can access the servers that are hosted at the LCSB.
# Connect to Cerbere via VPN
## VPN Temporary Password Reset
1. To reset temporary VPN password please visit [PasswordReset](https://passwordreset.uni.lu)
<img src="img/password-reset-vpn.png" height="300px"><br/>
2. Click on **Change password**
3. Enter
* Username - firstname.lastname
* Password - Temporary password provided by Sysadmins for VPN
<img src="img/password-reset-vpn-01.png" height="300px"><br/>
* Click **Next**
* Enter the new password that you want to use.
<img src="img/password-reset-vpn-02.png" height="300px"><br/>
## Download VPN
Once you have reset your VPN Password, please download VPN client from [VPN](https://vpn.uni.lu/)
**ENTER**
1. Username - firstname.lastname
2. Password - Password you have set for VPN
**Note**- If firstname.lastname does not work, give a try with firstname.lastname@uni.lu
<img src="img/vpn-download.png" height="300px"><br/>
Then depending on your distribution of OS, it will suggest you a link to download.
<img src="img/vpn-download-01.png" height="300px"><br/>
## Connect to Cerbere via VPN
1. Launch the VPN client and enter
1. [Launch the VPN client]({{ '/?access:vpn-access' | relative_url }}) and enter
<img src="img/vpn-connect-01.png" height="300px"><br/>
......
......@@ -51,10 +51,3 @@ The steps to switch **File History** on your computer is as follows:
The instructions for restoring your files from **File History** can be found [here](https://it.nmu.edu/docs/backup-using-windows-file-history)
## Backup to dropit.uni.lu
The University of Luxembourg's cloud service [DropIt](https://dropit.uni.lu/) provides all staff with 100GB of storage.
To use this service, first, visit [dropit.uni.lu](https://dropit.uni.lu/). You should be able to login with your university credentials. In case of login problems, request IT support using [ServiceNow](https://service.uni.lu/).
Second, in order to create backups of your computer on DropIt cloud, you need to install a client application. The University IT Guideline [here](https://uniluxembourg.sharepoint.com/sites/siu/Documents%20partages/Dropit%20client%20-%20configuration%20guide.pdf#search=dropit) provides the details on how to install this client application for macOS, Windows and Linux platforms, and also, how to configure the backup process on your computer.
external/contribute/supersede/img/img1.png

132 KiB

external/contribute/supersede/img/img2.png

48.4 KiB

external/contribute/supersede/img/img3.png

115 KiB

external/contribute/supersede/img/img4.png

15.6 KiB

external/contribute/supersede/img/img5.png

2.83 KiB

---
layout: page
permalink: /external/contribute/supersede/
shortcut: contribute:supersede
redirect_from:
- /cards/contribute:supersede
- /external/cards/contribute:supersede
- /contribute/supersede
- /external/external/contribute/supersede/
---
# Take over a stale merge request
In some cases, it might be useful to move the Merge Request of a branch opened by someone else to your own fork.
1. Open *Visual Studio Code*.
2. Select the ***develop*** branch and synchronize it.
3. In ***Terminal***, click on ***New Terminal***.
<div align="center">
<img src="img/img1.png" width="700">
</div>
**Steps 4 and 5 needs to be performed only the first time.**
4. If not done yet, configure the git mr command by following those [instructions](https://docs.gitlab.com/ee/user/project/merge_requests/reviews/#checkout-locally-by-adding-a-git-alias).
4.1 Open *Git Bash*
4.2 Type *vim ~/.gitconfig* - *Enter*
4.3 Type *i*
4.4 Type
[alias]
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
<div align="center">
<img src="img/img5.png" width="700">
</div>
4.5 Type *:wq*
5. In the *Terminal window*, type *git remote add upstream [paste the SSH Key]*.
You can copy the SSH key of the repository by clicking on Clone - copy on the repository page.
<div align="center">
<img src="img/img3.png" width="700" >
</div>
<div align="center">
<img src="img/img2.png" width="300" >
</div>
6. In the *Terminal window*, type *git mr upstream [number of the merge request]*.
You are now on the branch of the merge request.
7. Push it to your fork by clicking on the cloud icone on the bottom left of your screen.
<div align="center">
<img src="img/img4.png" width="100" >
</div>
8. On GitLab, open a new Merge Request with the newly created branch.
In description, write ***Supersedes ![number of the original MR]***.
9. In the original MR, write in the description ***Superseded by ![number of the newly created MR]*** and close the MR.
\ No newline at end of file
external/contribute/web-ide/img/img1.png

23.1 KiB | W: | H:

external/contribute/web-ide/img/img1.png

27.4 KiB | W: | H:

external/contribute/web-ide/img/img1.png
external/contribute/web-ide/img/img1.png
external/contribute/web-ide/img/img1.png
external/contribute/web-ide/img/img1.png
  • 2-up
  • Swipe
  • Onion skin
external/contribute/web-ide/img/img10.png

7.86 KiB | W: | H:

external/contribute/web-ide/img/img10.png

11 KiB | W: | H:

external/contribute/web-ide/img/img10.png
external/contribute/web-ide/img/img10.png
external/contribute/web-ide/img/img10.png
external/contribute/web-ide/img/img10.png
  • 2-up
  • Swipe
  • Onion skin
external/contribute/web-ide/img/img12.png

138 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment