Merge pull request #127 from ryanrath/pearc2022-xdmod-fixes

Pearc2022 xdmod fixes

Author: aebruno

database/xdmod.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+sql_mode =

xdmod/entrypoint.sh

@@ -75,9 +75,15 @@ then
         export TERM=linux
         /srv/xdmod/scripts/supremm.py
 
+        echo "---> XDMoD Open OnDemand module setup"
+        expect /srv/xdmod/scripts/xdmod-setup-ondemand.tcl | col -b
+
         echo "---> Make sure we have a place to keep our backups"
         mkdir -p /srv/xdmod/backups
     fi
+    echo "---> Staring php-fpm"
+    mkdir -p /run/php-fpm
+    php-fpm
 
     echo "---> Starting HTTPD on xdmod..."
     # Sometimes on shutdown pid still exists, so delete it

xdmod/install.sh

@@ -21,7 +21,9 @@ ARCHTYPE=`uname -m`
 
 dnf install -y \
     expect \
-    python2-pip
+    python2-pip \
+    php-pear \
+    php-devel
 
 pip2 install pexpect==4.4.0
 
@@ -37,7 +39,10 @@ pip2 install pexpect==4.4.0
 # be installed in the same container.  In a production deployment they may be installed
 # on separate hosts.
 #------------------------
-dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0/xdmod-10.0.0-1.0.beta1.el8.noarch.rpm
+dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0-beta4-el8/xdmod-10.0.0-1.4.beta4.el8.noarch.rpm \
+               https://github.com/ubccr/xdmod-ondemand/releases/download/v10.0.0/xdmod-ondemand-10.0.0-1.0.beta1.el8.noarch.rpm \
+               https://github.com/ubccr/xdmod/releases/download/v10.0.0-beta4-el8/xdmod-supremm-10.0.0-1.4.beta4.el8.noarch.rpm \
+               https://github.com/ubccr/supremm/releases/download/2.0.0-beta3/supremm-2.0.0-1.0_beta3.el8.x86_64.rpm
 
 #------------------------
 # The Job Performance software uses MongoDB to store the job-level performance
@@ -49,7 +54,15 @@ dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0/xdmod-10
 dnf install -y \
     https://repo.mongodb.org/yum/redhat/8/mongodb-org/5.0/${ARCHTYPE}/RPMS/mongodb-org-shell-5.0.9-1.el8.${ARCHTYPE}.rpm
 
-pip3 install pymongo --upgrade
+
+
+#------------------------
+#
+#------------------------
+pecl install mongodb
+echo "extension=mongodb.so" >> /etc/php.d/40-mongodb.ini
+
+pip3 install pymongo==3.7.0 --upgrade
 pip2 install pymongo --upgrade
 
 #------------------------
@@ -74,6 +87,14 @@ sed -i 's/.*date.timezone[[:space:]]*=.*/date.timezone = UTC/' /etc/php.ini
 #------------------------
 rm -f /etc/httpd/conf.d/ssl.conf
 
+#------------------------
+# We need to make sure that we have access to this file so that SSO works.
+#------------------------
+if [[ -f /etc/pki/tls/private/localhost.key ]]; then
+    chown root:apache /etc/pki/tls/private/localhost.key
+    chmod 750         /etc/pki/tls/private/localhost.key
+fi
+
 #------------------------
 # These commands remove cached files to reduce the overall image size.
 #------------------------

xdmod/scripts/supremm.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 import pexpect
 import sys
 

xdmod/scripts/xdmod-setup-ondemand.tcl

@@ -0,0 +1,53 @@
+#!/usr/bin/env expect
+# Expect script that run s xdmod-setup to configure a freshly installed
+# XDMoD instance. This script will fail if run against an already installed
+# XDMoD.
+
+#-------------------------------------------------------------------------------
+# Configuration settings for the XDMoD resources
+
+#-------------------------------------------------------------------------------
+
+# Load helper functions from helper-functions.tcl
+source [file join [file dirname [info script]] helper-functions.tcl]
+
+#-------------------------------------------------------------------------------
+# main body - note there are some hardcoded addresses, usernames and passwords here
+# they should typically not be changed as they need to match up with the
+# settings in the docker container
+
+set timeout 240
+spawn "xdmod-setup"
+
+# Add an OnDemand resource
+selectMenuOption 4
+
+selectMenuOption 1
+provideInput {Resource Name:} ondemand
+provideInput {Formal Name:} {Open OnDemand Instance}
+provideInput {Resource Type*} Gateway
+provideInput {How many nodes does this resource have?} 0
+provideInput {How many total processors (cpu cores) does this resource have?} 0
+
+selectMenuOption s
+confirmFileWrite yes
+enterToContinue
+confirmFileWrite yes
+enterToContinue
+
+# Setup the OnDemand database
+selectMenuOption 10
+
+selectMenuOption d
+
+answerQuestion {DB Admin Username} root
+providePassword {DB Admin Password:} {}
+confirmDropDb yes
+provideInput {Do you want to see the output*} {no}
+
+selectMenuOption q
+
+selectMenuOption q
+
+lassign [wait] pid spawnid os_error_flag value
+exit $value

xdmod/scripts/xdmod-setup-start.tcl

@@ -17,8 +17,6 @@ spawn "xdmod-setup"
 selectMenuOption 1
 answerQuestion {Site Address} https://localhost:4443/
 provideInput {Email Address:} ccr-xdmod-help@buffalo.edu
-provideInput {Java Path:} /usr/bin/java
-provideInput {Javac Path:} /usr/bin/javac
 provideInput {Chromium Path:} /usr/lib64/chromium-browser/headless_shell
 provideInput {Center Logo Path:} /srv/xdmod/small-logo.png
 provideInput {Center Logo Width:} 354