[whimsy] branch master updated: Don't assume infra-puppet is checked out

[se...@apache.org]

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 93cfd68  Don't assume infra-puppet is checked out
93cfd68 is described below

commit 93cfd68f5c800ef5d7afa90eebbe8b96d8b6b5f1
Author: Sebb <se...@apache.org>
AuthorDate: Mon Jul 6 11:31:31 2020 +0100

    Don't assume infra-puppet is checked out
---
 tools/mkconf.rb    | 5 +++--
 tools/vhosttest.rb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/mkconf.rb b/tools/mkconf.rb
index 42ae703..d81190e 100755
--- a/tools/mkconf.rb
+++ b/tools/mkconf.rb
@@ -4,8 +4,9 @@
 # Generate a whimsy.local version of the deployed whimsy configuration
 #
 # Example usage:
-#  ruby vhosttest.rb | ruby mkconf.rb /private/etc/apache2/other/whimsy.conf
-#
+#  ruby vhosttest.rb <infra-puppet-checkout> | ruby mkconf.rb /private/etc/apache2/other/whimsy.conf
+# or if you have ssh access to the whimsy host:
+# ruby mkconf.rb /private/etc/apache2/other/whimsy.conf
 
 if STDIN.tty?
   conf = `ssh whimsy.apache.org cat \
diff --git a/tools/vhosttest.rb b/tools/vhosttest.rb
index 4f22c94..5f1758d 100755
--- a/tools/vhosttest.rb
+++ b/tools/vhosttest.rb
@@ -9,7 +9,7 @@ $LOAD_PATH.unshift '/srv/whimsy/lib'
 require 'whimsy/asf'
 
 # Allow override of local repo
-IP = ARGV.shift || ASF::Git['infrastructure-puppet']
+IP = ARGV.shift or raise RuntimeError.new "Need path to infrastructure puppet checkout"
 
 module Puppet
   module Parser