Skip to content

Commit 84a0e7e

Browse files
authored
Integrate migverifyarchives, migimportdoi, migindexdoi and migacctexpire cron jobs (#117)
Integrate migverifyarchives, migimportdoi, migindexdoi and migacctexpire cron jobs, too. The first three are specific to freeze archives and only added if `ENABLE_FREEZE` is set.
2 parents 6039919 + ae590b0 commit 84a0e7e

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

Dockerfile.rocky8

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,10 +1594,14 @@ RUN ln -s index-${DOMAIN}.html $MIG_ROOT/state/wwwpublic/index.html && \
15941594
RUN sed -i -e "s@https://ext\.${EMULATE_FQDN}@https://${MIGOID_DOMAIN}@g;s@https://oid\.${EMULATE_FQDN}@https://${EXTOID_DOMAIN}@g;s@https://oidc\.${EMULATE_FQDN}@https://${EXTOIDC_DOMAIN}@g;s@https://${EMULATE_FQDN}@https://${PUBLIC_DOMAIN}@g;s@https://cert\.${EMULATE_FQDN}@https://${EXTCERT_DOMAIN}@g;s@https://sid\.${EMULATE_FQDN}@https://${SID_DOMAIN}@g" $MIG_ROOT/state/wwwpublic/index-${DOMAIN}.html
15951595

15961596
# Various cron jobs e.g. to clean stale state and inform migoid account users near expiry
1597-
# TODO: add migverifyarchives, migimportdoi, migindexdoi and migsftpmon?
1598-
# TODO: make sure native scripts like migerrors deliver mail outside container
1599-
RUN chmod 755 generated-confs/{migstateclean,mignotifyexpire,migerrors} \
1600-
&& cp generated-confs/{migstateclean,mignotifyexpire,migerrors} /etc/cron.daily/
1597+
RUN chmod 755 generated-confs/{migstateclean,mignotifyexpire,migerrors,migacctexpire} \
1598+
&& cp generated-confs/{migstateclean,mignotifyexpire,migerrors} /etc/cron.daily/ \
1599+
&& cp generated-confs/migacctexpire /etc/cron.monthly/
1600+
RUN if [ "${ENABLE_FREEZE}" = "True" ]; then \
1601+
chmod 755 generated-confs/{migimportdoi,migindexdoi,migverifyarchives} \
1602+
&& cp generated-confs/{migimportdoi,migindexdoi} /etc/cron.daily/ \
1603+
&& cp generated-confs/migverifyarchives /etc/cron.hourly/ ; \
1604+
fi;
16011605

16021606
# Logrotate config if enabled
16031607
RUN if [ "${ENABLE_LOGROTATE}" = "True" ]; then \

Dockerfile.rocky9

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,10 +1481,14 @@ RUN ln -s index-${DOMAIN}.html $MIG_ROOT/state/wwwpublic/index.html && \
14811481
RUN sed -i -e "s@https://ext\.${EMULATE_FQDN}@https://${MIGOID_DOMAIN}@g;s@https://oid\.${EMULATE_FQDN}@https://${EXTOID_DOMAIN}@g;s@https://oidc\.${EMULATE_FQDN}@https://${EXTOIDC_DOMAIN}@g;s@https://${EMULATE_FQDN}@https://${PUBLIC_DOMAIN}@g;s@https://cert\.${EMULATE_FQDN}@https://${EXTCERT_DOMAIN}@g;s@https://sid\.${EMULATE_FQDN}@https://${SID_DOMAIN}@g" $MIG_ROOT/state/wwwpublic/index-${DOMAIN}.html
14821482

14831483
# Various cron jobs e.g. to clean stale state and inform migoid account users near expiry
1484-
# TODO: add migverifyarchives, migimportdoi, migindexdoi and migsftpmon?
1485-
# TODO: make sure native scripts like migerrors deliver mail outside container
1486-
RUN chmod 755 generated-confs/{migstateclean,mignotifyexpire,migerrors} \
1487-
&& cp generated-confs/{migstateclean,mignotifyexpire,migerrors} /etc/cron.daily/
1484+
RUN chmod 755 generated-confs/{migstateclean,mignotifyexpire,migerrors,migacctexpire} \
1485+
&& cp generated-confs/{migstateclean,mignotifyexpire,migerrors} /etc/cron.daily/ \
1486+
&& cp generated-confs/migacctexpire /etc/cron.monthly/
1487+
RUN if [ "${ENABLE_FREEZE}" = "True" ]; then \
1488+
chmod 755 generated-confs/{migimportdoi,migindexdoi,migverifyarchives} \
1489+
&& cp generated-confs/{migimportdoi,migindexdoi} /etc/cron.daily/ \
1490+
&& cp generated-confs/migverifyarchives /etc/cron.hourly/ ; \
1491+
fi;
14881492

14891493
# Logrotate config if enabled
14901494
RUN if [ "${ENABLE_LOGROTATE}" = "True" ]; then \

0 commit comments

Comments
 (0)