diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8d8b51c674..d53e5d1089 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,8 @@ repos:
     - id: check-merge-conflict
     - id: check-yaml
     - id: detect-private-key
-    # - id: end-of-file-fixer
+    - id: end-of-file-fixer
+      files: \.(cgi|rb|ya?ml)$
     - id: fix-byte-order-marker
     - id: forbid-submodules
     - id: mixed-line-ending
diff --git a/compose.yaml b/compose.yaml
index 418210d586..519360a849 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -12,4 +12,4 @@ services:
     cap_add:
       - SYS_ADMIN
     # Seems to be needed to run puppeteer on macOS with Apple chips
-    platform: linux/amd64
\ No newline at end of file
+    platform: linux/amd64
diff --git a/lib/spec/lib/member_spec.rb b/lib/spec/lib/member_spec.rb
index 992690a05f..80b677e251 100644
--- a/lib/spec/lib/member_spec.rb
+++ b/lib/spec/lib/member_spec.rb
@@ -106,4 +106,3 @@
     expect(res).to eq('Charlie Ryman')
   end
 end
-
diff --git a/lib/spec/lib/person_spec.rb b/lib/spec/lib/person_spec.rb
index 0801772308..a5b7eb022e 100644
--- a/lib/spec/lib/person_spec.rb
+++ b/lib/spec/lib/person_spec.rb
@@ -50,4 +50,4 @@
     res = ASF::Person.ldap_parse_cn_DRAFT('one two three', true)
     expect(res).to eq(['one', ['two', 'three']])
   end
-end
\ No newline at end of file
+end
diff --git a/lib/whimsy/asf/orgchart.rb b/lib/whimsy/asf/orgchart.rb
index b54f45ac8f..4e26f3197f 100644
--- a/lib/whimsy/asf/orgchart.rb
+++ b/lib/whimsy/asf/orgchart.rb
@@ -88,4 +88,4 @@ def self.desc
   org.each.map do |k, v|
     p [k, (v['info']['id'] || v['info']['chair'] || '?')]
   end
-end
\ No newline at end of file
+end
diff --git a/tools/fixroster.rb b/tools/fixroster.rb
index 1f1ae85438..c4a78c103d 100644
--- a/tools/fixroster.rb
+++ b/tools/fixroster.rb
@@ -51,4 +51,4 @@
 
   end
   puts 'Done'
-end
\ No newline at end of file
+end
diff --git a/tools/inactive.rb b/tools/inactive.rb
index a828993049..1c206d7138 100755
--- a/tools/inactive.rb
+++ b/tools/inactive.rb
@@ -13,4 +13,4 @@
       p [cttee.name,availid,person.asf_member?]
     end
   end
-end
\ No newline at end of file
+end
diff --git a/tools/membersort.rb b/tools/membersort.rb
index d900e49c57..8fa43f6f09 100644
--- a/tools/membersort.rb
+++ b/tools/membersort.rb
@@ -19,4 +19,3 @@
   File.write(members, sorted)
   system 'svn', 'diff', members
 end
-
diff --git a/tools/migrate_podlings.rb b/tools/migrate_podlings.rb
index 30fad0ea22..42f7bab3be 100644
--- a/tools/migrate_podlings.rb
+++ b/tools/migrate_podlings.rb
@@ -5,4 +5,4 @@
 ASF::Podlings.list.select{ |p| p.status == 'current'}.each_entry{ |podling|
   pod_status_yml = File.join(incubator_podlings, "#{podling.resource}.yml")
   File.open(pod_status_yml, 'w') {|f| f.write(podling.default_status.to_yaml) }
-}
\ No newline at end of file
+}
diff --git a/tools/namemap.rb b/tools/namemap.rb
index 8c55d6d564..ad619a8bf9 100644
--- a/tools/namemap.rb
+++ b/tools/namemap.rb
@@ -262,4 +262,3 @@ def committer_dups(io)
 # dups, histogram = NameMap.committer_dups(File.read('committerlist-from-whimsy.json'))
 # puts JSON.pretty_generate(dups)
 # puts JSON.pretty_generate(histogram)
-
diff --git a/tools/ponypoop.rb b/tools/ponypoop.rb
index 8655927ccf..c06bc1ac28 100755
--- a/tools/ponypoop.rb
+++ b/tools/ponypoop.rb
@@ -209,4 +209,3 @@ def optparse
   end
   puts "END: Thanks for running ponypoop - see results in #{options[:dir]}"
 end
-
diff --git a/tools/proxyhelper.rb b/tools/proxyhelper.rb
index e485e339f2..56a0cd6bcd 100644
--- a/tools/proxyhelper.rb
+++ b/tools/proxyhelper.rb
@@ -41,4 +41,3 @@ def reminder_lines(meeting = File.basename(Dir[File.join(MEETINGS, '2*')].max))
 puts 'START: reminder_lines()'
 p = reminder_lines
 puts p
-
diff --git a/tools/setup_local_repo.rb b/tools/setup_local_repo.rb
index e994b09cb1..d567295752 100755
--- a/tools/setup_local_repo.rb
+++ b/tools/setup_local_repo.rb
@@ -92,4 +92,4 @@ def svnmkdir(relpath)
 # Set up some files needed for testing
 svncopy('asf/infrastructure/site/trunk/content/foundation/records/minutes/HEADER.html')
 svnmkdir('asf/infrastructure/site/trunk/content/foundation/records/minutes/2000')
-svncopy('asf/infrastructure/site/trunk/content/foundation/records/minutes/2000/board_minutes_2000_02_28.txt')
\ No newline at end of file
+svncopy('asf/infrastructure/site/trunk/content/foundation/records/minutes/2000/board_minutes_2000_02_28.txt')
diff --git a/www/board/list-traffic.cgi b/www/board/list-traffic.cgi
index 30a73ac72c..557f3d9644 100755
--- a/www/board/list-traffic.cgi
+++ b/www/board/list-traffic.cgi
@@ -3,4 +3,4 @@
 print "Status: 301 Moved Permanently\r\n"
 print "Location: ../officers/list-traffic.cgi\r\n"
 print "\r\n"
-exit
\ No newline at end of file
+exit
diff --git a/www/board/missing-reports.cgi b/www/board/missing-reports.cgi
index 1dfd5366e5..6000a0cde2 100755
--- a/www/board/missing-reports.cgi
+++ b/www/board/missing-reports.cgi
@@ -63,4 +63,3 @@ _html do
     end
   end
 end
-
diff --git a/www/committers/config_info.cgi b/www/committers/config_info.cgi
index b841a9e79c..c3df22fc7c 100755
--- a/www/committers/config_info.cgi
+++ b/www/committers/config_info.cgi
@@ -12,4 +12,4 @@ cfg = ASF::Config.instance_variable_get(:@config)
 
 cfg.each do |k,v|
   puts "%s: %s" % [k,v]
-end
\ No newline at end of file
+end
diff --git a/www/committers/tm-report.cgi b/www/committers/tm-report.cgi
index 61e8782176..5711c2e6cf 100755
--- a/www/committers/tm-report.cgi
+++ b/www/committers/tm-report.cgi
@@ -281,4 +281,3 @@ _html do
     end
   end
 end
-
diff --git a/www/incubator/podlings/by-age.cgi b/www/incubator/podlings/by-age.cgi
index 874de32d60..7ec7fc85ef 100755
--- a/www/incubator/podlings/by-age.cgi
+++ b/www/incubator/podlings/by-age.cgi
@@ -122,4 +122,3 @@ _html do
     end
   end
 end
-
diff --git a/www/members/download_check.cgi b/www/members/download_check.cgi
index 50b05e3085..b508e19fcd 100755
--- a/www/members/download_check.cgi
+++ b/www/members/download_check.cgi
@@ -109,4 +109,3 @@ _html do
     end
   end
 end
-
diff --git a/www/members/logs.cgi b/www/members/logs.cgi
index 0716e76dda..48ba58ba86 100755
--- a/www/members/logs.cgi
+++ b/www/members/logs.cgi
@@ -161,4 +161,4 @@ _html do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/www/members/memberless-pmcs.cgi b/www/members/memberless-pmcs.cgi
index 33bdccd699..74d7de91d7 100755
--- a/www/members/memberless-pmcs.cgi
+++ b/www/members/memberless-pmcs.cgi
@@ -79,4 +79,3 @@ _html do
     end
   end
 end
-
diff --git a/www/members/mentor-format.rb b/www/members/mentor-format.rb
index e4205e6fee..da67e3d22a 100644
--- a/www/members/mentor-format.rb
+++ b/www/members/mentor-format.rb
@@ -69,4 +69,4 @@ class MentorFormat
   def self.get_uimap(path)
     return JSON.parse(File.read(File.join(path, 'ui-map.json')))
   end
-end
\ No newline at end of file
+end
diff --git a/www/members/mentors.cgi b/www/members/mentors.cgi
index 9ddb8127bf..907e64c53c 100755
--- a/www/members/mentors.cgi
+++ b/www/members/mentors.cgi
@@ -153,4 +153,4 @@ _html do
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/www/members/mirror_check.cgi b/www/members/mirror_check.cgi
index 49ce097d30..6f4499cec2 100755
--- a/www/members/mirror_check.cgi
+++ b/www/members/mirror_check.cgi
@@ -52,4 +52,3 @@ _html do
     end
   end
 end
-
diff --git a/www/members/namediff.cgi b/www/members/namediff.cgi
index d2c663fcd1..b29e4d0a53 100755
--- a/www/members/namediff.cgi
+++ b/www/members/namediff.cgi
@@ -78,4 +78,4 @@ _html do
         }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/www/members/page-scanner.cgi b/www/members/page-scanner.cgi
index 47b118b896..76b255df78 100755
--- a/www/members/page-scanner.cgi
+++ b/www/members/page-scanner.cgi
@@ -83,4 +83,3 @@ if url
 else
   print "Expecting: ?url=http://.../[&showurl] (or ?host=abcd => ?url=https://abcd.apache.org/\n"
 end
-
diff --git a/www/members/repo-use.cgi b/www/members/repo-use.cgi
index 1ede86e4f0..dfaca76688 100755
--- a/www/members/repo-use.cgi
+++ b/www/members/repo-use.cgi
@@ -97,4 +97,4 @@ _html do
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/www/officers/board-stats.cgi b/www/officers/board-stats.cgi
index 27767a8da4..d97d6f2038 100755
--- a/www/officers/board-stats.cgi
+++ b/www/officers/board-stats.cgi
@@ -126,4 +126,3 @@ _html do
 
   end
 end
-
diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index ce3febbc7f..6b26491467 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -232,4 +232,3 @@ Regards,\n
     _p {_ "Reload ";_a "this page",href: "coi.cgi";_span " to see the results."}
   end
 end
-
diff --git a/www/officers/unlistedclas.cgi b/www/officers/unlistedclas.cgi
index 9a23162e41..c211af166f 100755
--- a/www/officers/unlistedclas.cgi
+++ b/www/officers/unlistedclas.cgi
@@ -71,4 +71,3 @@ _html do
     end
   end
 end
-
diff --git a/www/project/icla/views/actions/update.json.rb b/www/project/icla/views/actions/update.json.rb
index 51379acdaf..3f8792c18e 100644
--- a/www/project/icla/views/actions/update.json.rb
+++ b/www/project/icla/views/actions/update.json.rb
@@ -210,4 +210,4 @@ def process()
   end
 else
   process
-end
\ No newline at end of file
+end
diff --git a/www/roster/public_member_info.rb b/www/roster/public_member_info.rb
index b5dd9b2e0d..9ca25ac0fe 100644
--- a/www/roster/public_member_info.rb
+++ b/www/roster/public_member_info.rb
@@ -100,4 +100,3 @@
   end
 
 end
-
diff --git a/www/roster/views/app.js.rb b/www/roster/views/app.js.rb
index 2ce92202e8..1ab489bcce 100644
--- a/www/roster/views/app.js.rb
+++ b/www/roster/views/app.js.rb
@@ -47,4 +47,3 @@
 require_relative 'group'
 
 require_relative 'utils'
-
diff --git a/www/roster/views/person/github.js.rb b/www/roster/views/person/github.js.rb
index 5225a80bbe..933bddf8d5 100644
--- a/www/roster/views/person/github.js.rb
+++ b/www/roster/views/person/github.js.rb
@@ -69,4 +69,3 @@ def render
     end
   end
 end
-
diff --git a/www/roster/views/person/sshkeys.js.rb b/www/roster/views/person/sshkeys.js.rb
index eccea1d1e6..7ce9e3029f 100644
--- a/www/roster/views/person/sshkeys.js.rb
+++ b/www/roster/views/person/sshkeys.js.rb
@@ -47,4 +47,3 @@ def render
     end
   end
 end
-
diff --git a/www/secretary/response-time.cgi b/www/secretary/response-time.cgi
index 1b2918e688..6e4a136d75 100755
--- a/www/secretary/response-time.cgi
+++ b/www/secretary/response-time.cgi
@@ -48,4 +48,3 @@ _json do
   _result `#{CMD.sub(/\bofficers\b/, ASF::SVN['officers'])}`
   _server Time.now - startTime
 end
-
diff --git a/www/secretary/upload_file.cgi b/www/secretary/upload_file.cgi
index 5b74c22b27..7161fd95fb 100755
--- a/www/secretary/upload_file.cgi
+++ b/www/secretary/upload_file.cgi
@@ -72,4 +72,3 @@ _html do
     end
   end
 end
-