Skip to content

(INF-3292) Oct 2025 XDMod Cleanup #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: htcss-branch
Choose a base branch
from
Open

(INF-3292) Oct 2025 XDMod Cleanup #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f538781
Set shred cronjob to restart httpd in same line
williamnswanson Oct 2, 2025
5c5038b
Change usage of yum to dnf in Dockerfile
williamnswanson Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM hub.opensciencegrid.org/opensciencegrid/software-base:23-el8-release

RUN yum install -y vim gettext
RUN dnf install -y vim gettext

RUN dnf module -y reset nodejs
RUN dnf module -y install nodejs:16
Expand All @@ -11,7 +11,7 @@ RUN dnf install -y https://github.com/eiffel777/xdmod-htcss/releases/download/v1
# Give xdmod user a shell to allow for running cron jobs
RUN usermod -s /bin/bash xdmod

RUN yum install -y mariadb-server sendmail libreoffice chromium-headless php-fpm
RUN dnf install -y mariadb-server sendmail libreoffice chromium-headless php-fpm

COPY ./configuration_files/mysql-confs/mariadb-server.cnf /etc/my.cnf.d/mariadb-server.cnf
COPY ./configuration_files/mysql-confs/client.cnf /etc/my.cnf.d/client.cnf
Expand Down Expand Up @@ -72,4 +72,4 @@ ENV APACHE_TLSCERT_PATH='APACHE_TLSCERT_PATH'
ENV APACHE_TLSKEY_PATH='APACHE_TLSKEY_PATH'
ENV MYSQL_ROOT_PASS_PATH='MYSQL_ROOT_PASS_PATH'
ENV MYSQL_SERVER_MEM_GIGS='MYSQL_SERVER_MEM_GIGS'
ENV PHP_TIMEZONE='UTC'
ENV PHP_TIMEZONE='UTC'
7 changes: 2 additions & 5 deletions xdmod_htcss_cron
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@ HTCSS_DATA_LOG_DIR=$HTCSS_DATA_LOG_DIR
# Check for updates (monthly).
#0 1 1 * * xdmod /usr/lib64/xdmod/update_check.php >/dev/null

# Shred and ingest any new jobs daily
0 1 * * * xdmod /setup_and_scripts/htcss_shred_ingest_script.sh

# Refresh web data display after ingesting
0 4 * * * root httpd -k restart
# Shred and ingest any new jobs daily and Refresh web data display after ingesting
0 1 * * * xdmod /setup_and_scripts/htcss_shred_ingest_script.sh && sudo httpd -k restart