From 61c95634367dc397f27701e9a2d91d3fdcf8b9ea Mon Sep 17 00:00:00 2001
From: Ondrej Dvorak <ondrej.dvorak@vsb.cz>
Date: Fri, 2 Sep 2022 16:25:55 +0200
Subject: [PATCH] zmena download dir pro cert a zmena v certech pathu
---
docs.it4i/config.yml | 2 +-
docs.it4i/dice.md | 39 +++++++++++++++++---------------
docs.it4i/irods_environment.json | 2 +-
3 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/docs.it4i/config.yml b/docs.it4i/config.yml
index 12b62dd05..e4275302b 100644
--- a/docs.it4i/config.yml
+++ b/docs.it4i/config.yml
@@ -5,7 +5,7 @@ client_user: some_user
zone: IT4I
authscheme: "pam"
-ssl_ca_cert_file: "/usr/local/etc/irods.it4i.cz.crt"
+ssl_ca_cert_file: "~/irods.it4i.cz.crt"
ssl_encryption_key_size: 32
ssl_encryption_algorithm: "AES-256-CBC"
ssl_encryption_salt_size: 8
diff --git a/docs.it4i/dice.md b/docs.it4i/dice.md
index caf6da8a4..113d58701 100644
--- a/docs.it4i/dice.md
+++ b/docs.it4i/dice.md
@@ -161,14 +161,14 @@ Enter your current PAM password:
```console
cd ~
-sudo wget https://docs.it4i.cz/irods.it4i.cz.crt -P /usr/local/etc/
wget https://github.com/cyverse/irodsfs/releases/download/v0.7.6/irodsfs_amd64_linux_v0.7.6.tar
tar -xvf ~/irodsfs_amd64_linux_v0.7.6.tar
-mkdir ~/IRODS ~/.irods
-cd ~/.irods && wget https://docs.it4i.cz/config.yml
+mkdir ~/IRODS ~/.irods/ && cd "$_" && wget https://docs.it4i.cz/config.yml
+sudo wget https://docs.it4i.cz/irods.it4i.cz.crt -P ~/.irods/
+sed 's,~,'"$HOME"',g' ~/irods/irods_environment.json
```
-- edit `~/.irods/config.yml` with username from aai
+- edit `~/.irods/config.yml` with username from [AAI][f]
***How to mount your collection:***
@@ -213,29 +213,31 @@ total 0
***steps for Ubuntu20:***
```console
-Prepare IRODS APT repository
-
-dejan@dejan:~$ LSB_RELEASE="bionic"
-dejan@dejan:~$ wget -qO - https://packages.irods.org/irods-signing-key.asc | sudo apt-key add -
-OK
-dejan@dejan:~$ echo "deb [arch=amd64] https://packages.irods.org/apt/ ${LSB_RELEASE} main" \
+LSB_RELEASE="bionic"
+wget -qO - https://packages.irods.org/irods-signing-key.asc | sudo apt-key add -
+echo "deb [arch=amd64] https://packages.irods.org/apt/ ${LSB_RELEASE} main" \
> | sudo tee /etc/apt/sources.list.d/renci-irods.list
deb [arch=amd64] https://packages.irods.org/apt/ bionic main
-dejan@dejan:~$ sudo apt-get update
-dejan@dejan:~$ apt-cache search irods
-dejan@dejan:~$ wget -c \
+
+sudo apt-get update
+apt-cache search irods
+wget -c \
http://security.ubuntu.com/ubuntu/pool/main/p/python-urllib3/python-urllib3_1.22-1ubuntu0.18.04.2_all.deb \
http://security.ubuntu.com/ubuntu/pool/main/r/requests/python-requests_2.18.4-2ubuntu0.1_all.deb \
http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.10_amd64.deb
-dejan@dejan:~$ sudo apt install \
+sudo apt install \
./python-urllib3_1.22-1ubuntu0.18.04.2_all.deb \
./python-requests_2.18.4-2ubuntu0.1_all.deb \
./libssl1.0.0_1.0.2n-1ubuntu5.6_amd64.deb
-dejan@dejan:~$ rm -rf \
+sudo rm -rf \
./python-urllib3_1.22-1ubuntu0.18.04.2_all.deb \
./python-requests_2.18.4-2ubuntu0.1_all.deb \
./libssl1.0.0_1.0.2n-1ubuntu5.6_amd64.deb
-dejan@dejan:~$ sudo apt install -y irods-icommands
+sudo apt install -y irods-icommands
+mkdir ~/.irods/ && cd "$_" && wget https://docs.it4i.cz/irods_environment.json
+sudo wget https://docs.it4i.cz/irods.it4i.cz.crt -P ~/.irods
+sed 's,~,'"$HOME"',g' ~/.irods/irods_environment.json
+
```
***Steps for centos***
@@ -246,11 +248,12 @@ sudo wget -qO - https://packages.irods.org/renci-irods.yum.repo | sudo tee /etc/
sudo yum install epel-release -y
sudo yum install python-psutil python-jsonschema
sudo yum install irods-icommands
-sudo wget https://docs.it4i.cz/irods.it4i.cz.crt -P /usr/local/etc/
mkdir ~/.irods/ && cd "$_" && wget https://docs.it4i.cz/irods_environment.json
+sudo wget https://docs.it4i.cz/irods.it4i.cz.crt -P ~/.irods
+sed 's,~,'"$HOME"',g' ~/.irods/irods_environment.json
```
-- edit ***irods_user_name*** in `~/.irods/irods_environment.json` with username from aai
+- edit ***irods_user_name*** in `~/.irods/irods_environment.json` with username from [AAI][f]
```console
[some_user@local_pc ~]$ pwd
diff --git a/docs.it4i/irods_environment.json b/docs.it4i/irods_environment.json
index ea79cde3e..d0d38abfe 100644
--- a/docs.it4i/irods_environment.json
+++ b/docs.it4i/irods_environment.json
@@ -5,7 +5,7 @@
"irods_zone_name": "IT4I",
"irods_authentication_scheme": "pam_password",
"irods_ssl_verify_server": "cert",
- "irods_ssl_ca_certificate_file": "/usr/local/etc/irods.it4i.cz.crt",
+ "irods_ssl_ca_certificate_file": "~/irods.it4i.cz.crt",
"irods_encryption_algorithm": "AES-256-CBC",
"irods_encryption_key_size": 32,
"irods_encryption_num_hash_rounds": 16,
--
GitLab