From ae7ad2af19cc1ee904c9a967ca54ab82952473f1 Mon Sep 17 00:00:00 2001 From: Waldo Jaquith Date: Thu, 28 Dec 2023 11:43:35 -0500 Subject: [PATCH] Explicitly invoke expect here This avoids any potential problems with sftp.sh not being executable. --- deploy/crontab.txt | 10 +++++----- deploy/sftp_credentials.sh | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deploy/crontab.txt b/deploy/crontab.txt index e8b9269..8902523 100644 --- a/deploy/crontab.txt +++ b/deploy/crontab.txt @@ -1,14 +1,14 @@ # The core update script. This runs hourly at 55 after, 4 minutes after DLAS outputs their data -55 6-23 * * * rs-machine/cron/sftp.sh BILLS.CSV rs-machine/cron/bills.csv -55 6-23 * * * rs-machine/cron/sftp.sh Committees.csv rs-machine/cron/committees.csv +55 6-23 * * * /usr/bin/expect rs-machine/cron/sftp.sh BILLS.CSV rs-machine/cron/bills.csv +55 6-23 * * * /usr/bin/expect rs-machine/cron/sftp.sh Committees.csv rs-machine/cron/committees.csv 55 6-23 * * * /usr/bin/php rs-machine/cron/update.php # The update script that handles the advancing of bills. This runs hourly at 2 after, 2 minutes after DLAS outputs their data. -02 6-23 * * * rs-machine/cron/sftp.sh HISTORY.CSV rs-machine/cron/history.csv +02 6-23 * * * /usr/bin/expect rs-machine/cron/sftp.sh HISTORY.CSV rs-machine/cron/history.csv 02 6-23 * * * /usr/bin/php rs-machine/cron/update.php history # The daily script that collects and tallies votes. This runs at 3:00, an hour after DLAS outputs their data. -0 3 * * * rs-machine/cron/sftp.sh VOTE.CSV rs-machine/cron/vote.csv +0 3 * * * /usr/bin/expect rs-machine/cron/sftp.sh VOTE.CSV rs-machine/cron/vote.csv 0 3 * * * /usr/bin/php rs-machine/cron/update.php vote # Collects scheduled meetings and hearings. @@ -18,7 +18,7 @@ 0 6,9,12,15,18,21 * * * /usr/bin/php rs-machine/cron/update.php minutes # Update the bill summaries (which is updated daily at 11:53). -59 11 * * * rs-machine/cron/sftp.sh Summaries.csv rs-machine/cron/summaries.csv +59 11 * * * /usr/bin/expect rs-machine/cron/sftp.sh Summaries.csv rs-machine/cron/summaries.csv 59 11 * * * /usr/bin/php rs-machine/cron/update.php summaries # Update the bill full text. diff --git a/deploy/sftp_credentials.sh b/deploy/sftp_credentials.sh index 7ad6180..6e92469 100755 --- a/deploy/sftp_credentials.sh +++ b/deploy/sftp_credentials.sh @@ -3,3 +3,4 @@ # Set up FTP credentials in the SFTP script. sed -i -e "s|{LIS_FTP_PASSWORD}|${LIS_FTP_PASSWORD}|g" cron/sftp.sh sed -i -e "s|{LIS_FTP_USERNAME}|${LIS_FTP_USERNAME}|g" cron/sftp.sh +sed -i -e "s|{LIS_SESSION_ID}|${LIS_SESSION_ID}|g" cron/sftp.sh