From a2fcb554107646d5b1f4b501a7ab37b5aff7e70e Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Mon, 17 Feb 2020 16:45:37 +0100
Subject: [PATCH] merge 2 sections of passwords
---
external/access/passwords/mac-reset.md | 18 ------------------
external/access/passwords/passwords.md | 8 ++++++++
2 files changed, 8 insertions(+), 18 deletions(-)
delete mode 100644 external/access/passwords/mac-reset.md
diff --git a/external/access/passwords/mac-reset.md b/external/access/passwords/mac-reset.md
deleted file mode 100644
index d2a605e9..00000000
--- a/external/access/passwords/mac-reset.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-permalink: /external/access/passwords/mac-reset
-shortcut: passwords:mac-reset
-redirect_from:
- - /cards/passwords:mac-reset
- - /external/cards/passwords:mac-reset
----
-
-# Tips when resetting University of Luxembourg Active Directory password on a Mac
-
-To reset your UL AD password when using a Mac:
-
- 1. Go to <https://owa.uni.lu> and change your password there.
- 2. **Before** rebooting your Mac, you should change your keychain password to avoid any issues down the road. To do so, run the following command `security set-keychain-password "/Users/YOURHOME/Library/Keychains/login.keychain-db"`
- 3. If you use FileVault, after the first reboot, first enter your old password, then the new one. Normally, FileVault will sync and update with your new password after you reboot.
-
-
diff --git a/external/access/passwords/passwords.md b/external/access/passwords/passwords.md
index ad4b45d7..f1cdd0f2 100644
--- a/external/access/passwords/passwords.md
+++ b/external/access/passwords/passwords.md
@@ -57,3 +57,11 @@ When sending passwords to collaborators, it is not advised to use e-mail or inst
* your password link has already expired. In that case you will have to request a new link.<br/>
**Warning!**: If the password link was set with one access only (**Burn after reading**) and you are sure that you haven't accessed the link so far, you should notify the password sender because there is a chance that your communication was intercepted and someone accessed the link before you.<br/>
**Note**: If the page looks different from the pictures above, try using Google Chrome browser. If the issue persists, please take a screenshot of the page and send it to our [sysadmin](mailto:lcsb-sysadmins@uni.lu) team.
+
+# Tips when resetting University of Luxembourg Active Directory password on a Mac
+
+To reset your UL AD password when using a Mac:
+
+ 1. Go to <https://owa.uni.lu> and change your password there.
+ 2. **Before** rebooting your Mac, you should change your keychain password to avoid any issues down the road. To do so, run the following command `security set-keychain-password "/Users/YOURHOME/Library/Keychains/login.keychain-db"`
+ 3. If you use FileVault, after the first reboot, first enter your old password, then the new one. Normally, FileVault will sync and update with your new password after you reboot.
--
GitLab