Fix merge conflict in README

This commit is contained in:
Alexandre CATTEAU 2022-12-30 12:25:40 +01:00
commit f5d3052c4a
2 changed files with 13 additions and 1 deletions

View File

@ -8,6 +8,14 @@ This repository contains a small setup to automate the delivery of our root cert
#### Installation
* `install.sh` copies the certificates to the right location and then reloads the system's certificates (Linux only)
### Firefox
* On Mint, had to use the following so that Firefox uses system CAs:
```
sudo mv /usr/lib/firefox/libnssckbi.so /usr/lib/firefox/libnssckbi.so.bak
sudo ln -s /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox/libnssckbi.so
```
* Stil unclear: Will this be overwritten at Firefox update?
### Kodi Android
Since Android does not allow to import our root certificate, we have to import directly in Kodi:
1. find Kodi app user data directory (usually `/sdcard/Android/data/org.xbmc.kodi`)

View File

@ -14,10 +14,14 @@ else
sudo=""
fi
$sudo cp $run_directory/*.crt /etc/ca-certificates/trust-source/anchors/
if command -v update-ca-trust > /dev/null; then
$sudo cp $run_directory/*.crt /etc/ca-certificates/trust-source/anchors/
$sudo update-ca-trust
elif command -v update-ca-certificates > /dev/null; then
$sudo cp $run_directory/*.crt /usr/local/share/ca-certificates/
$sudo update-ca-certificates
elif [ -f /usr/sbin/update-ca-certificates ]; then # Debian...
$sudo cp $run_directory/*.crt /usr/local/share/ca-certificates/
$sudo update-ca-certificates
else
echo "No update-ca binary found. Exiting with error!"