This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new ba0d012f Move test script
ba0d012f is described below
commit ba0d012f5b068c34130e35b3e1ad69a22bcc2140
Author: Sebb <[email protected]>
AuthorDate: Fri Mar 8 23:22:08 2024 +0000
Move test script
---
www/board/test.cgi | 2 +-
www/committers/test.cgi | 80 +++++++++++++++++++++++++++++++++++++-
www/members/test.cgi | 2 +-
www/officers/test.cgi | 2 +-
www/test.cgi | 76 +-----------------------------------
www/test/apldap/test.cgi | 2 +-
www/test/committer/test.cgi | 2 +-
www/test/incubator/test.cgi | 2 +-
www/test/member-incubator/test.cgi | 2 +-
www/test/member/test.cgi | 2 +-
www/test/pmc-chair/test.cgi | 2 +-
www/test/secretary/test.cgi | 2 +-
12 files changed, 89 insertions(+), 87 deletions(-)
diff --git a/www/board/test.cgi b/www/board/test.cgi
index df11cca8..b8d155f6 100755
--- a/www/board/test.cgi
+++ b/www/board/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester" # Wvisible:tools
-load "#{__dir__}/../test.cgi"
+load "#{__dir__}/../committers/test.cgi"
diff --git a/www/committers/test.cgi b/www/committers/test.cgi
index df11cca8..70fb28a1 100755
--- a/www/committers/test.cgi
+++ b/www/committers/test.cgi
@@ -1,3 +1,79 @@
#!/usr/bin/env ruby
-PAGETITLE = "Whimsy Environment Tester" # Wvisible:tools
-load "#{__dir__}/../test.cgi"
+
+print "Content-type: text/plain; charset=UTF-8\r\n\r\n"
+
+ENV.sort.each do |k,v|
+ if k.eql? 'HTTP_AUTHORIZATION'
+ # cannot use sub! because value is frozen
+ # redact non-empty string
+ if v and not v.empty?
+ v = '<redacted>'
+ end
+ end
+ print "#{k} #{v}\n"
+end
+
+def puts_system(*cmd)
+ puts ['$', cmd].join ' '
+ system(*cmd) or puts 'failed'
+end
+
+if ENV['SCRIPT_URL'] == '/members/test.cgi'
+ print "\n"
+ begin
+ $LOAD_PATH.unshift '/srv/whimsy/lib'
+ require 'whimsy/asf'
+ puts "LDAP.hosts:"
+ puts ASF::LDAP.hosts
+ puts "LDAP.rwhosts:"
+ puts ASF::LDAP.rwhosts
+ rescue Exception => e
+ p e
+ end
+end
+
+# Optional extra info (from the main script only)
+query = ENV['QUERY_STRING'] || ARGV[0]
+if query and not query.empty? and ENV['SCRIPT_URL'] == '/committers/test.cgi'
+ print "\n"
+ puts_system('id')
+ puts_system('whoami')
+ puts_system('which', '-a', 'svn')
+ puts_system('svn', '--version')
+ puts_system('which', '-a', 'git')
+ puts_system('git', '--version')
+ puts_system('which', '-a', 'svnmucc')
+ puts_system('svnmucc', '--version')
+ puts_system('which', '-a', 'ruby')
+ puts_system('which', '-a', 'ruby2.3.0')
+ puts_system('ruby', '-v')
+ puts_system('gem', 'env')
+ puts_system('which', '-a', 'gem')
+ puts_system('PATH=/usr/local/bin:$PATH which -a gem')
+ puts_system('service', 'puppet', 'status')
+ puts_system('git', '-C', '/srv/whimsy', 'show', '--format="%h, %ci %cr"',
'-s', 'HEAD')
+ puts_system('git', '-C', '/srv/whimsy', 'ls-remote', 'origin', 'master')
+ wait=query.match(/^sleep=(\d+)$/)[1].to_i rescue 0
+ if wait > 0
+ print "\nWaiting #{wait} seconds ..."
+ STDOUT.flush
+ sleep wait
+ print " done waiting\n"
+ end
+ require 'socket'
+ hostname = Socket.gethostname
+ require 'resolv'
+ master = nil
+ current = nil
+ Resolv::DNS.open do |rs|
+ master = rs.getaddress("whimsy.apache.org")
+ current = rs.getaddress(hostname) rescue nil
+ end
+ print "master: #{master} current: #{current}\n"
+ if current == master
+ print "This system is the Whimsy master\n"
+ else
+ print "This system is not the Whimsy master\n"
+ end
+ print "All done\n"
+end
diff --git a/www/members/test.cgi b/www/members/test.cgi
index df11cca8..b8d155f6 100755
--- a/www/members/test.cgi
+++ b/www/members/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester" # Wvisible:tools
-load "#{__dir__}/../test.cgi"
+load "#{__dir__}/../committers/test.cgi"
diff --git a/www/officers/test.cgi b/www/officers/test.cgi
index df11cca8..b8d155f6 100755
--- a/www/officers/test.cgi
+++ b/www/officers/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester" # Wvisible:tools
-load "#{__dir__}/../test.cgi"
+load "#{__dir__}/../committers/test.cgi"
diff --git a/www/test.cgi b/www/test.cgi
index 8a260394..b6c6efb7 100755
--- a/www/test.cgi
+++ b/www/test.cgi
@@ -2,78 +2,4 @@
print "Content-type: text/plain; charset=UTF-8\r\n\r\n"
-ENV.sort.each do |k,v|
- if k.eql? 'HTTP_AUTHORIZATION'
- # cannot use sub! because value is frozen
- # redact non-empty string
- if v and not v.empty?
- v = '<redacted>'
- end
- end
- print "#{k} #{v}\n"
-end
-
-def puts_system(*cmd)
- puts ['$', cmd].join ' '
- system(*cmd) or puts 'failed'
-end
-
-if ENV['SCRIPT_URL'] == '/members/test.cgi'
- print "\n"
- begin
- $LOAD_PATH.unshift '/srv/whimsy/lib'
- require 'whimsy/asf'
- puts "LDAP.hosts:"
- puts ASF::LDAP.hosts
- puts "LDAP.rwhosts:"
- puts ASF::LDAP.rwhosts
- rescue Exception => e
- p e
- end
-end
-
-# Optional extra info (from the main script only)
-query = ENV['QUERY_STRING'] || ARGV[0]
-if query and not query.empty? and ENV['SCRIPT_URL'] == '/test.cgi'
- print "\n"
- puts_system('id')
- puts_system('whoami')
- puts_system('which', '-a', 'svn')
- puts_system('svn', '--version')
- puts_system('which', '-a', 'git')
- puts_system('git', '--version')
- puts_system('which', '-a', 'svnmucc')
- puts_system('svnmucc', '--version')
- puts_system('which', '-a', 'ruby')
- puts_system('which', '-a', 'ruby2.3.0')
- puts_system('ruby', '-v')
- puts_system('gem', 'env')
- puts_system('which', '-a', 'gem')
- puts_system('PATH=/usr/local/bin:$PATH which -a gem')
- puts_system('service', 'puppet', 'status')
- puts_system('git', '-C', '/srv/whimsy', 'show', '--format="%h, %ci %cr"',
'-s', 'HEAD')
- puts_system('git', '-C', '/srv/whimsy', 'ls-remote', 'origin', 'master')
- wait=query.match(/^sleep=(\d+)$/)[1].to_i rescue 0
- if wait > 0
- print "\nWaiting #{wait} seconds ..."
- STDOUT.flush
- sleep wait
- print " done waiting\n"
- end
- require 'socket'
- hostname = Socket.gethostname
- require 'resolv'
- master = nil
- current = nil
- Resolv::DNS.open do |rs|
- master = rs.getaddress("whimsy.apache.org")
- current = rs.getaddress(hostname) rescue nil
- end
- print "master: #{master} current: #{current}\n"
- if current == master
- print "This system is the Whimsy master\n"
- else
- print "This system is not the Whimsy master\n"
- end
- print "All done\n"
-end
+Hello
diff --git a/www/test/apldap/test.cgi b/www/test/apldap/test.cgi
index 97c40334..2428dc88 100755
--- a/www/test/apldap/test.cgi
+++ b/www/test/apldap/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester"
-load "#{__dir__}/../../test.cgi"
+load "#{__dir__}/../../committers/test.cgi"
diff --git a/www/test/committer/test.cgi b/www/test/committer/test.cgi
index 97c40334..2428dc88 100755
--- a/www/test/committer/test.cgi
+++ b/www/test/committer/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester"
-load "#{__dir__}/../../test.cgi"
+load "#{__dir__}/../../committers/test.cgi"
diff --git a/www/test/incubator/test.cgi b/www/test/incubator/test.cgi
index 97c40334..2428dc88 100755
--- a/www/test/incubator/test.cgi
+++ b/www/test/incubator/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester"
-load "#{__dir__}/../../test.cgi"
+load "#{__dir__}/../../committers/test.cgi"
diff --git a/www/test/member-incubator/test.cgi
b/www/test/member-incubator/test.cgi
index 97c40334..2428dc88 100755
--- a/www/test/member-incubator/test.cgi
+++ b/www/test/member-incubator/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester"
-load "#{__dir__}/../../test.cgi"
+load "#{__dir__}/../../committers/test.cgi"
diff --git a/www/test/member/test.cgi b/www/test/member/test.cgi
index 97c40334..2428dc88 100755
--- a/www/test/member/test.cgi
+++ b/www/test/member/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester"
-load "#{__dir__}/../../test.cgi"
+load "#{__dir__}/../../committers/test.cgi"
diff --git a/www/test/pmc-chair/test.cgi b/www/test/pmc-chair/test.cgi
index 97c40334..2428dc88 100755
--- a/www/test/pmc-chair/test.cgi
+++ b/www/test/pmc-chair/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester"
-load "#{__dir__}/../../test.cgi"
+load "#{__dir__}/../../committers/test.cgi"
diff --git a/www/test/secretary/test.cgi b/www/test/secretary/test.cgi
index 97c40334..2428dc88 100755
--- a/www/test/secretary/test.cgi
+++ b/www/test/secretary/test.cgi
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
PAGETITLE = "Whimsy Environment Tester"
-load "#{__dir__}/../../test.cgi"
+load "#{__dir__}/../../committers/test.cgi"
