[whimsy] branch master updated: Fix mac user and group. See:

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys 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 b2fa8ec  Fix mac user and group.  See:
b2fa8ec is described below

commit b2fa8ec31a700d5772b40f6bd5ab007d8d3d97e3
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Nov 17 09:37:25 2020 -0500

    Fix mac user and group.  See:
    
    https://lists.apache.org/thread.html/ra2e081b03eca6c7c65cacb009b0eac6674b8de1861300e02cc45b76e%40%3Ccommits.whimsical.apache.org%3E
---
 config/setupmymac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/setupmymac b/config/setupmymac
index 2b1686d..23bc40f 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -515,6 +515,8 @@ if wconf_content =~ /^\s*SetEnv PATH /i
     "SetEnv PATH #{File.dirname RbConfig.ruby}:" +
     "#{File.dirname(`which svnmucc`)}:${PATH}"
 end
+wconf_content.sub! /^\s*PassengerUser .*/i, "PassengerUser #{user}"
+wconf_content.sub! /^\s*PassengerGroup .*/i, "PassengerGroup #{group}"
 wconf_target = '/private/etc/apache2/other/whimsy.conf'
 if 
   not File.exist?(wconf_target) or