From 9cec12ddf08eef983571726a7b9a0982a3c2cd8b Mon Sep 17 00:00:00 2001
From: P-O Quirion <pioliqui@gmail.com>
Date: Thu, 5 Sep 2019 15:23:49 -0400
Subject: [PATCH] Bypass computed canada default config

---
 Dockerfile                                            |  6 +++---
 config.d/ref.mugqic.conf                              |  4 ++--
 config.d/soft.mugqic.conf                             |  4 ++--
 init_genpipes                                         | 11 +++--------
 .../cvmfs-config.computecanada.ca.pub                 |  0
 keys/ref.mugqic.pub                                   |  9 +++++++++
 keys/soft.mugqic.pub                                  |  9 +++++++++
 7 files changed, 28 insertions(+), 15 deletions(-)
 rename cvmfs-config.computecanada.ca.pub => keys/cvmfs-config.computecanada.ca.pub (100%)
 create mode 100644 keys/ref.mugqic.pub
 create mode 100644 keys/soft.mugqic.pub

diff --git a/Dockerfile b/Dockerfile
index 8e18014..e2655e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,11 +19,11 @@ RUN wget http://ccl.cse.nd.edu/software/files/cctools-${CCTOOLS_VERSION}-x86_64-
   && tar xvf cctools-${CCTOOLS_VERSION}-x86_64-centos7.tar.gz && mv cctools-${CCTOOLS_VERSION}-x86_64-centos7 \
   /opt/cctools && rm cctools-${CCTOOLS_VERSION}-x86_64-centos7.tar.gz
 
-ADD cvmfs-config.computecanada.ca.pub /etc/cvmfs/keys/.
+RUN mkdir /etc/parrot
+ADD keys /etc/parrot/keys
 RUN chmod 4755 /bin/ping
-RUN mkdir /etc/parrot 
 # adding local config to containe. These will overwrite the cvmfs-config.computecanada ones
-ADD config.d /etc/parrot/.
+ADD config.d /etc/parrot/config.d
 RUN mkdir /cvmfs-cache && chmod 777 /cvmfs-cache
 
 # module
diff --git a/config.d/ref.mugqic.conf b/config.d/ref.mugqic.conf
index 9357a95..a68efdd 100644
--- a/config.d/ref.mugqic.conf
+++ b/config.d/ref.mugqic.conf
@@ -1,2 +1,2 @@
-CVMFS_SERVER_URL="http://cvmfs-s0-genomic.vhost38.genap.ca/cvmfs/@fqrn@"
-CVMFS_KEYS_DIR=/tmp/cvmfs-config.computecanada.ca/etc/cvmfs/keys/mugqic
+CVMFS_SERVER_URL="http://cvmfs-1-west-c3g.computecanada.ca:8000/cvmfs/@fqrn@;http://cvmfs-s0-genomic.vhost38.genap.ca/cvmfs/@fqrn@"
+CVMFS_KEYS_DIR=/etc/cvmfs/keys/mugqic
diff --git a/config.d/soft.mugqic.conf b/config.d/soft.mugqic.conf
index 9357a95..a68efdd 100644
--- a/config.d/soft.mugqic.conf
+++ b/config.d/soft.mugqic.conf
@@ -1,2 +1,2 @@
-CVMFS_SERVER_URL="http://cvmfs-s0-genomic.vhost38.genap.ca/cvmfs/@fqrn@"
-CVMFS_KEYS_DIR=/tmp/cvmfs-config.computecanada.ca/etc/cvmfs/keys/mugqic
+CVMFS_SERVER_URL="http://cvmfs-1-west-c3g.computecanada.ca:8000/cvmfs/@fqrn@;http://cvmfs-s0-genomic.vhost38.genap.ca/cvmfs/@fqrn@"
+CVMFS_KEYS_DIR=/etc/cvmfs/keys/mugqic
diff --git a/init_genpipes b/init_genpipes
index a3d0380..49e160c 100755
--- a/init_genpipes
+++ b/init_genpipes
@@ -6,9 +6,7 @@
 # It also loads the lmod software to load mugqic modules 
 
 export PARROT_ALLOW_SWITCHING_CVMFS_REPOSITORIES=yes
-CVMFS_CONFIG_CC="cvmfs-s1-beluga.computecanada.ca:8000/cvmfs/cvmfs-config.computecanada.ca,pubkey=/etc/cvmfs/keys/cvmfs-config.computecanada.ca.pub;cvmfs-s1-arbutus.computecanada.ca:8000/cvmfs/cvmfs-config.computecanada.ca,pubkey=/etc/cvmfs/keys/cvmfs-config.computecanada.ca.pub;cvmfs-s1-east.computecanada.ca:8000/cvmfs/cvmfs-config.computecanada.ca,pubkey=/etc/cvmfs/keys/cvmfs-config.computecanada.ca.pub"
-export PARROT_CVMFS_REPO="${CVMFS_CONFIG_CC}"
-export HTTP_PROXY='DIRECT' 
+export HTTP_PROXY='DIRECT'
 
 LOCAL_CONFIG_PATH=/etc/parrot
 PARROT_CVMFS_ALIEN_CACHE=/tmp/parrot.${UID}
@@ -84,12 +82,9 @@ if [ $# -gt 0 ] ; then
   chmod 755 ${genpipe_script}
   echo $@ > ${genpipe_script}
 fi
-  
-# copy the compute.canada config locally, this will let the other repo be mounted.
-/opt/cctools/bin/parrot_run $QUIET cp -r /cvmfs/cvmfs-config.computecanada.ca /tmp/. 2>/dev/null
 
-CONFIG_PATH=/tmp/cvmfs-config.computecanada.ca/etc/cvmfs/config.d
-KEY_PATH=/tmp/cvmfs-config.computecanada.ca/etc/cvmfs/keys/mugqic
+CONFIG_PATH=/etc/parrot/config.d
+KEY_PATH=/etc/parrot/keys
 
 cvmfs_to_parrot() {
   repo_name=$1 
diff --git a/cvmfs-config.computecanada.ca.pub b/keys/cvmfs-config.computecanada.ca.pub
similarity index 100%
rename from cvmfs-config.computecanada.ca.pub
rename to keys/cvmfs-config.computecanada.ca.pub
diff --git a/keys/ref.mugqic.pub b/keys/ref.mugqic.pub
new file mode 100644
index 0000000..6480e2b
--- /dev/null
+++ b/keys/ref.mugqic.pub
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lrXZ+70U+0Gh0rL6HX3
+UUuArl7XqvcHiMQViSiXW7/OpjrbyN806lr3DWrCoMsQ6qA9KYWNke56fIfpQgXO
+RhaMKQnsfYbgIf7Ei1nz7XCjs1Pm0uDF5RWQrGLmTUmdd5MsEbB6/ZfsS0sspInK
+aRW8XTi1YcRVTL1vEWm6gE75V4gplUNPpMXzBQKGqAaXrG9q7yVA2A19YSj8FqI/
+TaQQN1mKoqKECgLzxG7ng3YKafUt8BcsE+kC7TThdnNRCq/E31Bz0sc8RIk6UCEO
+WcEhx7+HKAoMejFryO9bO7vEsbh9rkXmtPUwKz/PikX5hf2h2BV9pmKqyl2HusvG
+wQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/keys/soft.mugqic.pub b/keys/soft.mugqic.pub
new file mode 100644
index 0000000..6ba1389
--- /dev/null
+++ b/keys/soft.mugqic.pub
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm64Ql1uLgxomMkiLb4zq
+xh4ieF3Ivr6R4CWxy2LGY8DvxohtDgTqnnj4lSeL3vROuKJ1hARgcggDSjpbDb86
+qTb/dNwfOIwJ6OBR/X50RcpM+dB22NhH1Tc1imSjdYBvOVejf7BqfODnMjyRyK6u
+wQM6JYjKcEpTQyjnRAftzZUawvXaLZuqn9gVzfS4zk+eeM9FvCkcpFQIbkNvZn5j
+r05R1nBj7LTQ8U+KW/Vzj/x8aP6VjJkq3/anS+WU4AFls+6zd01W6KNw0wiQv9C2
+2r6vQ3egAdwrjXTNfJJsX+7e0egN+TvDJMRuDq7Sn+vivQ7XqJN0+7YhRkG47TpL
+4wIDAQAB
+-----END PUBLIC KEY-----