From 5ea985ce45954b6ae6986aad92a8ca3b9d811664 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Fri, 8 Nov 2024 11:50:40 -0600
Subject: DO NOT MERGE: Revert commit 4ddf33d

---
 genenetwork/services/genenetwork.scm | 50 ++++++------------------------------
 1 file changed, 8 insertions(+), 42 deletions(-)

(limited to 'genenetwork')

diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index ec3af23..2c6b277 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -332,7 +332,6 @@ object."
            (gn2-profile (profile
                          (content (package->development-manifest genenetwork2))
                          (allow-collisions? #t)))
-           (gn2-ca-bundle (file-append gn2-profile "/etc/ssl/certs/ca-certificates.crt"))
            (gn2-conf (computed-file "gn2.conf"
                                     (configuration-file-gexp
                                      `(("GN2_SECRETS" ,(string-append gn2-secrets "/gn2-secrets.py"))
@@ -347,10 +346,6 @@ object."
                                        ("PLINK_COMMAND" ,(file-append gn2-profile "/bin/plink2"))
                                        ("SQL_URI" ,sql-uri)
                                        ("AI_SEARCH_ENABLED" "True")))))
-           (gn3-profile (profile
-                         (content (package->development-manifest genenetwork3))
-                         (allow-collisions? #t)))
-           (gn3-ca-bundle (file-append gn3-profile "/etc/ssl/certs/ca-certificates.crt"))
            (gn3-conf (computed-file "gn3.conf"
                                     (configuration-file-gexp
                                      `(("AUTH_DB" ,auth-db)
@@ -363,10 +358,6 @@ object."
                                        ("GENOTYPE_FILES" ,genotype-files)
                                        ("REAPER_COMMAND" ,(file-append gn2-profile "/bin/qtlreaper"))
                                        ("LLM_DB_PATH" ,llm-db-path)))))
-           (gn-auth-profile (profile
-                             (content (package->development-manifest gn-auth))
-                             (allow-collisions? #t)))
-           (gn-auth-ca-bundle (file-append gn-auth-profile "/etc/ssl/certs/ca-certificates.crt"))
            (gn-auth-conf (computed-file "gn-auth.conf"
                                         (configuration-file-gexp
                                          `(("GN_AUTH_SECRETS" ,(string-append gn-auth-secrets "/gn-auth-secrets.py"))
@@ -394,10 +385,7 @@ object."
                      (value gn2-conf))
                     (environment-variable
                      (name "HOME")
-                     (value "/tmp"))
-                    (environment-variable
-                     (name "REQUESTS_CA_BUNDLE")
-                     (value gn2-ca-bundle))))
+                     (value "/tmp"))))
              (mappings (list database-mapping
                              (file-system-mapping
                               (source genotype-files)
@@ -418,10 +406,7 @@ object."
                              (file-system-mapping
                               (source gn2-secrets)
                               (target source)
-                              (writable? #t))
-                             (file-system-mapping
-                              (source gn2-ca-bundle)
-                              (target source))))
+                              (writable? #t))))
              (extra-cli-arguments
               (list "--log-level"
                     (string-upcase (symbol->string log-level)))))
@@ -448,10 +433,7 @@ object."
                      (value gn3-secrets))
                     (environment-variable
                      (name "HOME")
-                     (value "/tmp"))
-                    (environment-variable
-                     (name "REQUESTS_CA_BUNDLE")
-                     (value gn3-ca-bundle))))
+                     (value "/tmp"))))
              (mappings (list database-mapping
                              (file-system-mapping
                               (source gn3-conf)
@@ -478,10 +460,7 @@ object."
                              (file-system-mapping
                               (source llm-db-path)
                               (target source)
-                              (writable? #t))
-                             (file-system-mapping
-                              (source gn3-ca-bundle)
-                              (target source))))
+                              (writable? #t))))
              (extra-cli-arguments
               (list "--log-level"
                     (string-upcase (symbol->string log-level)))))
@@ -501,10 +480,7 @@ object."
                      (value "/tmp"))
                     (environment-variable
                      (name "AUTHLIB_INSECURE_TRANSPORT")
-                     (value "true"))
-                    (environment-variable
-                     (name "REQUESTS_CA_BUNDLE")
-                     (value gn-auth-ca-bundle))))
+                     (value "true"))))
              (mappings (list database-mapping
                              (file-system-mapping
                               (source gn-auth-conf)
@@ -516,10 +492,7 @@ object."
                              (file-system-mapping
                               (source gn-auth-secrets)
                               (target source)
-                              (writable? #t))
-                             (file-system-mapping
-                              (source gn-auth-ca-bundle)
-                              (target source))))
+                              (writable? #t))))
              (extra-cli-arguments
               (list "--log-level"
                     (string-upcase (symbol->string log-level)))))))))
@@ -633,8 +606,7 @@ a @code{<genenetwork-configuration>} record."
                                               ("GN2_SERVER_URL" ,gn2-server-url)))))
           (gn-uploader-profile (profile
                                 (content (package->development-manifest gn-uploader))
-                                (allow-collisions? #t)))
-          (gn-uploader-ca-bundle (file-append gn-uploader-profile "/etc/ssl/certs/ca-certificates.crt")))
+                                (allow-collisions? #t))))
       (list (gunicorn-app
              (name "gn-uploader")
              (package gn-uploader)
@@ -651,10 +623,7 @@ a @code{<genenetwork-configuration>} record."
                      (value "/tmp"))
                     (environment-variable
                      (name "GN_UPLOADER_ENVIRONMENT")
-                     (value gn-uploader-profile))
-                    (environment-variable
-                     (name "REQUESTS_CA_BUNDLE")
-                     (value gn-uploader-ca-bundle))))
+                     (value gn-uploader-profile))))
              (mappings (list database-mapping
                              (file-system-mapping
                               (source gn-uploader-conf)
@@ -668,9 +637,6 @@ a @code{<genenetwork-configuration>} record."
                               (writable? #t))
                              (file-system-mapping
                               (source gn-uploader-profile)
-                              (target source))
-                             (file-system-mapping
-                              (source gn-uploader-ca-bundle)
                               (target source))))
              (extra-cli-arguments
               (list "--log-level"
-- 
cgit v1.2.3