[whimsy] branch master updated: Allow for missing Passenger user/group items

[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 94ed7dc  Allow for missing Passenger user/group items
94ed7dc is described below

commit 94ed7dc58ae88f8dfdb9eb038774dd634ad361af
Author: Sebb <se...@apache.org>
AuthorDate: Sun Sep 10 09:53:56 2017 +0100

    Allow for missing Passenger user/group items
---
 www/test/vhost-generator.cgi | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/test/vhost-generator.cgi b/www/test/vhost-generator.cgi
index eac54de..239e185 100755
--- a/www/test/vhost-generator.cgi
+++ b/www/test/vhost-generator.cgi
@@ -24,9 +24,15 @@ if ENV['REQUEST_METHOD'].to_s.upcase == 'POST'
     conf[/()ErrorLog/, 1] = '# '
     conf[/()CustomLog/, 1] = '# '
 
-    # disable Passenger Default user and group
-    conf[/()PassengerDefaultUser/, 1] = '# '
-    conf[/()PassengerDefaultGroup/, 1] = '# '
+    # disable Passenger Default user and group (if present)
+    begin
+        conf[/()PassengerDefaultUser/, 1] = '# '
+    rescue 
+    end
+    begin
+        conf[/()PassengerDefaultGroup/, 1] = '# '
+    rescue
+    end
 
     # global replace docroot
     conf.gsub! '/srv/whimsy', docroot.chomp('/')

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].