Merge pull request #192 from tenforwardconsulting/bs-backport-ruby-ch…

…ecksum use checksum instead of deprecated sha256 for get_url
tenforwardconsulting · Jan 2, 2023 · c428c6d · c428c6d
2 parents ea4b84a + 0e4347e
commit c428c6d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ This project attempts to follow [semantic versioning](https://semver.org/).
   * Stops showing color if you `sudo su`
 
 ## Unreleased
+## 2.5.10
+  * Backport the fix for ansible's change of get_url checksum arguments
 
 ## 2.5.9
   * backport disabling mitogen

diff --git a/README.md b/README.md
@@ -386,7 +386,7 @@ Install monitoring and automatic startup for resque workers via monit. You MUST
 Installs ruby on the machine.  YOu can set a version by picking off the download url and sha hash from ruby-lang.org
 
     ruby_version: ruby-2.4.1
-    ruby_checksum: a330e10d5cb5e53b3a0078326c5731888bb55e32c4abfeb27d9e7f8e5d000250
+    ruby_checksum: sha256:a330e10d5cb5e53b3a0078326c5731888bb55e32c4abfeb27d9e7f8e5d000250
     ruby_download_location: 'https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.1.tar.gz'
     bundler_version: 2.0.1
 

diff --git a/ansible/roles/ruby-common/README.md b/ansible/roles/ruby-common/README.md
@@ -23,7 +23,7 @@ Role Variables
 
 > ruby_version: This variable controls the version of Ruby that will be compiled and installed. It should correspond with the tarball filename excluding the ".tar.gz" extension (e.g. "ruby-1.9.3-p484").
 
-> ruby_checksum: The SHA256 checksum of the gzipped tarball that will be downloaded and compiled.
+> ruby_checksum: The checksum of the gzipped tarball that will be downloaded and compiled. (prefix with algorithm, e.g. sha256:abcdef01234567890)
 
 > ruby_download_location: The URL that the tarball should be retrieved from. Using the ruby_version variable within this variable is a good practice (e.g. "http://cache.ruby-lang.org/pub/ruby/1.9/{{ ruby_version }}.tar.gz").
 

diff --git a/ansible/roles/ruby-common/tasks/main.yml b/ansible/roles/ruby-common/tasks/main.yml
@@ -40,7 +40,7 @@
 - name: Download the Ruby source code
   get_url: url={{ ruby_download_location }}
            dest=/usr/local/src/
-           sha256sum={{ ruby_checksum }}
+           checksum={{ ruby_checksum }}
   become: true
 
 - name: Generate the Ruby installation script

diff --git a/lib/subspace/version.rb b/lib/subspace/version.rb
@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "2.5.9"
+  VERSION = "2.5.10"
 end