From 29744d2af23c7ac3f1f87b7b72e02cd369b19505 Mon Sep 17 00:00:00 2001
From: Morgan Rodgers <mrodgers@osc.edu>
Date: Wed, 13 Nov 2019 11:28:03 -0500
Subject: [PATCH] Fix Apache timeout caused by SSH command

Fixes #31
---
 CHANGELOG.md           |  7 ++++++-
 template/script.sh.erb | 15 +++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8965af..64fd6c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.11.2] - 2019-11-13
+### Fixed
+- Fixes Apache timeout [#31](https://github.com/OSC/bc_osc_jupyter/issues/31)
+
 ## [0.11.1] - 2019-11-05
 ### Changed
 - Removed static kernel for Julia 1.0.0
@@ -146,7 +150,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/bc_osc_jupyter/compare/v0.11.1...HEAD
+[Unreleased]: https://github.com/OSC/bc_osc_jupyter/compare/v0.11.2...HEAD
+[0.11.2]: https://github.com/OSC/bc_osc_jupyter/compare/v0.11.1...v0.11.2
 [0.11.1]: https://github.com/OSC/bc_osc_jupyter/compare/v0.11.0...v0.11.1
 [0.11.0]: https://github.com/OSC/bc_osc_jupyter/compare/v0.10.3...v0.11.0
 [0.10.3]: https://github.com/OSC/bc_osc_jupyter/compare/v0.10.2...v0.10.3
diff --git a/template/script.sh.erb b/template/script.sh.erb
index 69ab077..7ac2bbe 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -3,16 +3,15 @@
 <%-
   require 'pathname'
 
+  # The list of Julia installations that LMod knows about
   # @returns [[major_minor_version, "lmod_load_string"], ["0.6", "julia/0.6.4"]]
   def get_lmod_julia_versions
-      `ssh -o BatchMode=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no owens.osc.edu 'bash --login -c "module spider julia"' 2>&1`.scan(
-          /julia\/(?:(?<maj>\d+)\.(?<min>\d+)\.(?<pat>\d+))/
-      ).uniq.map do |mtch|
-          [
-              "#{mtch[0]}.#{mtch[1]}",
-              "#{mtch.join('.')}"
-          ]
-      end
+      [
+        ["0.5", "0.5.1"],
+        ["0.6", "0.6.4"],
+        ["1.0", "1.0.0"],
+        ["1.1", "1.1.1"]
+      ]
   end
 
   # @returns [[major_minor_version, kernel_version], ["1.0", "1.20.0"]]