Skip to content

Commit

Permalink
Merge pull request #115 from kjsanger/fix/revert-controller-patch
Browse files Browse the repository at this point in the history
Fix the controller patch applied to iRODS 4.3.2
  • Loading branch information
kjsanger authored Sep 4, 2024
2 parents c174019 + 8366125 commit e70e878
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions docker/irods/scripts/configure_irods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ case "$IRODS_VERSION" in
python3 /var/lib/irods/scripts/setup_irods.py < /opt/docker/irods/config/4.3.x.setup_irods.py.in
;;
4.3.2)
patch /var/lib/irods/scripts/irods/controller.py /opt/docker/irods/patches/patch_controller.diff
# Logging has been changed to use rsyslog. A potential enhancement is to configure that here.
python3 /var/lib/irods/scripts/setup_irods.py < /opt/docker/irods/config/4.3.x.setup_irods.py.in
;;
4.3.3)
patch /var/lib/irods/scripts/irods/controller.py /opt/docker/irods/patches/patch_controller.diff
# Logging has been changed to use rsyslog. A potential enhancement is to configure that here.
python3 /var/lib/irods/scripts/setup_irods.py < /opt/docker/irods/config/4.3.x.setup_irods.py.in
;;
Expand Down

0 comments on commit e70e878

Please sign in to comment.