Move production to tux04.

* production-deploy.sh: Update paths for mysql, xapian and
genenetwork-sqlite directories. Share path to redis state directory.
* production.scm (operating-system)[services]{virtuoso-service-type}:
Update server-port and http-server-port.
{forge-nginx-service-type}: Update http and https ports.
{redis-service-type}: New service.
{genenetwork-service-type}: Update server-name, gn-auth-server-name,
gn2-port, gn3-port, gn-auth-port, xapian-db, sparql-endpoint and
gn3-data-directory. Add auth-db, log-level and gn3-alias-server-port.
Remove genotype-files.

Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>

2 files changed, 30 insertions, 18 deletions

diff --git a/production-deploy.sh b/production-deploy.sh
index b4924a7..26f06f7 100755
--- a/production-deploy.sh
+++ b/production-deploy.sh
@@ -2,6 +2,7 @@
 
 # genenetwork-machines --- Guix configuration for genenetwork machines
 # Copyright © 2022, 2024 Arun Isaac <arunisaac@systemreboot.net>
+# Copyright © 2024 Frederick Muriuki Muriithi <fredmanglis@protonmail.com>
 #
 # This file is part of genenetwork-machines.
 #
@@ -27,13 +28,13 @@ container_script=$(guix system container \
                         --verbosity=3 \
                         --share=/export2/guix-containers/genenetwork/var/genenetwork=/var/genenetwork \
                         --share=/export2/guix-containers/genenetwork/var/lib/acme=/var/lib/acme \
-                        --share=/export2/guix-containers/genenetwork/var/lib/mysql=/var/lib/mysql \
+                        --share=/export2/guix-containers/genenetwork/var/lib/redis=/var/lib/redis \
+                        --share=/export/mysql/database=/var/lib/mysql \
                         --share=/export2/guix-containers/genenetwork/var/lib/virtuoso=/var/lib/virtuoso \
                         --share=/export2/guix-containers/genenetwork/var/log=/var/log \
                         --share=/export2/guix-containers/genenetwork/etc/genenetwork=/etc/genenetwork \
-                        --expose=/export/data/genenetwork-xapian \
-                        --share=/export/data/genenetwork-sqlite \
-                        --expose=/export/data/genenetwork/genotype_files \
+                        --share=/export2/guix-containers/genenetwork/var/lib/xapian=/var/lib/xapian \
+                        --share=/export2/guix-containers/genenetwork/var/lib/genenetwork-sqlite=/var/lib/genenetwork-sqlite \
                         --share=/var/run/mysqld=/run/mysqld \
                         production.scm)
 
diff --git a/production.scm b/production.scm
index 399c921..d1cd777 100644
--- a/production.scm
+++ b/production.scm
@@ -1,5 +1,6 @@
 ;;; genenetwork-machines --- Guix configuration for genenetwork machines
 ;;; Copyright © 2022–2024 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2024 Frederick Muriuki Muriithi <fredmanglis@protonmail.com>
 ;;;
 ;;; This file is part of genenetwork-machines.
 ;;;
@@ -17,6 +18,9 @@
 ;;; along with genenetwork-machines.  If not, see
 ;;; <https://www.gnu.org/licenses/>.
 
+;;; This is the production genenetwork container currently deployed on
+;;; tux04.
+
 (use-modules (gnu)
              (genenetwork services genenetwork)
              ((gnu packages admin) #:select (shepherd))
@@ -45,32 +49,39 @@
                              (auto-upgrade? #f)))
                    (service virtuoso-service-type
                             (virtuoso-configuration
-                             (server-port 7892)
-                             (http-server-port 7893)))
+                             (server-port 9892)
+                             (http-server-port 9893)))
                    (service forge-nginx-service-type
                             (forge-nginx-configuration
                              (http-listen (forge-ip-socket
                                            (ip "0.0.0.0")
-                                           (port 7890)))
+                                           (port 9890)))
                              (https-listen (forge-ip-socket
                                             (ip "0.0.0.0")
-                                            (port 7891)))))
+                                            (port 9891)))))
                    (service acme-service-type
                             (acme-configuration
                              (email "arunisaac@systemreboot.net")))
+                   (service redis-service-type
+                            (redis-configuration
+                             (bind "127.0.0.1")
+                             (port 6379)
+                             (working-directory "/var/lib/redis")))
                    (service genenetwork-service-type
                             (genenetwork-configuration
-                             (server-name "test1.genenetwork.org")
-                             (gn-auth-server-name "test1-auth.genenetwork.org")
-                             (gn2-port 7894)
-                             (gn3-port 7895)
-                             (gn-auth-port 7896)
+                             (server-name "genenetwork.org")
+                             (gn-auth-server-name "auth.genenetwork.org")
+                             (gn2-port 9894)
+                             (gn3-port 9895)
+                             (gn-auth-port 9896)
                              (sql-uri "mysql://webqtlout:webqtlout@localhost/db_webqtl")
-                             (xapian-db "/export/data/genenetwork-xapian")
-                             (genotype-files "/export/data/genenetwork/genotype_files")
-                             (sparql-endpoint "http://localhost:7893/sparql")
-                             (gn3-data-directory "/export/data/genenetwork")
+                             (xapian-db "/var/lib/xapian")
+                             (sparql-endpoint "http://localhost:9893/sparql")
+                             (gn3-data-directory "/var/genenetwork/data/genenetwork3")
                              (gn2-secrets "/etc/genenetwork/genenetwork2")
                              (gn3-secrets "/etc/genenetwork/genenetwork3/gn3-secrets.py")
-                             (gn-auth-secrets "/etc/genenetwork/gn-auth")))
+                             (gn-auth-secrets "/etc/genenetwork/gn-auth")
+                             (auth-db "/var/lib/genenetwork-sqlite/auth.db")
+                             (gn3-alias-server-port 9800)
+                             (log-level 'debug)))
                    %base-services)))