From 87067eba90fa333f63984d4a5740c4796b3af74f Mon Sep 17 00:00:00 2001
From: Pauline Ribeyre <ribeyre@uchicago.edu>
Date: Fri, 12 Jul 2019 10:43:23 -0500
Subject: [PATCH] Fix fence deployment for python 3 fence (>=4.0.0) (#45)

---
 scripts/fence_setup.sh  | 2 +-
 scripts/indexd_setup.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/fence_setup.sh b/scripts/fence_setup.sh
index d1307e5..9e22c16 100644
--- a/scripts/fence_setup.sh
+++ b/scripts/fence_setup.sh
@@ -13,4 +13,4 @@ update-ca-certificates
 
 fence-create sync --yaml user.yaml --arborist http://arborist-service
 
-rm -f /var/run/apache2/apache2.pid && /usr/sbin/apache2ctl -D FOREGROUND
+/dockerrun.sh
diff --git a/scripts/indexd_setup.sh b/scripts/indexd_setup.sh
index 1ca0f17..7a6e866 100644
--- a/scripts/indexd_setup.sh
+++ b/scripts/indexd_setup.sh
@@ -11,4 +11,4 @@ done
 echo "postgres is ready"
 
 python /indexd/bin/index_admin.py create --username indexd_client --password indexd_client_pass
-rm -f /var/run/apache2/apache2.pid && /dockerrun.sh
+/dockerrun.sh