From 88992751bae6749c1d860253e2d158cf5c940f71 Mon Sep 17 00:00:00 2001
From: Alexander VanTol <avantol13@gmail.com>
Date: Tue, 2 Jul 2019 08:51:42 -0500
Subject: [PATCH 1/5] change from apache to nginx

---
 bin/google-user-sa-validation.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/google-user-sa-validation.sh b/bin/google-user-sa-validation.sh
index 1c126c81e..c3446dd1b 100755
--- a/bin/google-user-sa-validation.sh
+++ b/bin/google-user-sa-validation.sh
@@ -10,9 +10,10 @@ echo '<virtualhost *:80>
     <directory "/google_job/status.json">
       require all granted
     </directory>
-</virtualhost>' >/etc/apache2/sites-available/fence.conf
-rm -rf /var/run/apache2/apache2.pid
-/usr/sbin/apache2ctl start
+</virtualhost>' >/etc/nginx/sites-available/fence.conf
+rm -rf /var/run/nginx
+rm -rf /var/run/nginx.pid
+/usr/sbin/nginx
 while [ $? -eq 0 ]; do
     echo start validation $(date)
     fence-create google-manage-user-registrations

From 7cc3bb9216fb18d3bb4f6a2423108beb38efef96 Mon Sep 17 00:00:00 2001
From: Alexander VanTol <avantol13@gmail.com>
Date: Tue, 2 Jul 2019 09:06:34 -0500
Subject: [PATCH 2/5] fix(google-cron): just remove .pid file

---
 bin/google-user-sa-validation.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/google-user-sa-validation.sh b/bin/google-user-sa-validation.sh
index c3446dd1b..1b2f083bf 100755
--- a/bin/google-user-sa-validation.sh
+++ b/bin/google-user-sa-validation.sh
@@ -11,7 +11,6 @@ echo '<virtualhost *:80>
       require all granted
     </directory>
 </virtualhost>' >/etc/nginx/sites-available/fence.conf
-rm -rf /var/run/nginx
 rm -rf /var/run/nginx.pid
 /usr/sbin/nginx
 while [ $? -eq 0 ]; do

From 22d60fa3304a3d810302b291c4b4ebfde8c50dd0 Mon Sep 17 00:00:00 2001
From: Alexander VanTol <avantol13@gmail.com>
Date: Tue, 2 Jul 2019 09:21:39 -0500
Subject: [PATCH 3/5] chore(logs): add some logs

---
 bin/google-user-sa-validation.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bin/google-user-sa-validation.sh b/bin/google-user-sa-validation.sh
index 1b2f083bf..c9ddb77bb 100755
--- a/bin/google-user-sa-validation.sh
+++ b/bin/google-user-sa-validation.sh
@@ -11,8 +11,15 @@ echo '<virtualhost *:80>
       require all granted
     </directory>
 </virtualhost>' >/etc/nginx/sites-available/fence.conf
+echo uwsgi.conf:
+cat /etc/nginx/conf.d/uwsgi.conf
+
 rm -rf /var/run/nginx.pid
 /usr/sbin/nginx
+
+echo uwsgi.conf after starting:
+cat /etc/nginx/conf.d/uwsgi.conf
+
 while [ $? -eq 0 ]; do
     echo start validation $(date)
     fence-create google-manage-user-registrations

From cc7a38f680f250dd31ac3c26efa9620d6e4ed9fa Mon Sep 17 00:00:00 2001
From: Alexander VanTol <avantol13@gmail.com>
Date: Tue, 2 Jul 2019 10:27:12 -0500
Subject: [PATCH 4/5] fix(google-cron): call dockerrun for starting nginx

---
 bin/google-user-sa-validation.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/google-user-sa-validation.sh b/bin/google-user-sa-validation.sh
index c9ddb77bb..677330fd1 100755
--- a/bin/google-user-sa-validation.sh
+++ b/bin/google-user-sa-validation.sh
@@ -11,13 +11,11 @@ echo '<virtualhost *:80>
       require all granted
     </directory>
 </virtualhost>' >/etc/nginx/sites-available/fence.conf
-echo uwsgi.conf:
-cat /etc/nginx/conf.d/uwsgi.conf
 
 rm -rf /var/run/nginx.pid
-/usr/sbin/nginx
+/fence/dockerrun.bash
 
-echo uwsgi.conf after starting:
+echo uwsgi.conf:
 cat /etc/nginx/conf.d/uwsgi.conf
 
 while [ $? -eq 0 ]; do

From d36709b74a4ae9150a11d34dd2d4f0314176b825 Mon Sep 17 00:00:00 2001
From: Alexander VanTol <avantol13@gmail.com>
Date: Tue, 2 Jul 2019 10:45:18 -0500
Subject: [PATCH 5/5] chore(logs): remove logging

---
 bin/google-user-sa-validation.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bin/google-user-sa-validation.sh b/bin/google-user-sa-validation.sh
index 677330fd1..f882a2f93 100755
--- a/bin/google-user-sa-validation.sh
+++ b/bin/google-user-sa-validation.sh
@@ -15,9 +15,6 @@ echo '<virtualhost *:80>
 rm -rf /var/run/nginx.pid
 /fence/dockerrun.bash
 
-echo uwsgi.conf:
-cat /etc/nginx/conf.d/uwsgi.conf
-
 while [ $? -eq 0 ]; do
     echo start validation $(date)
     fence-create google-manage-user-registrations