[whimsy] branch master updated: Also fix ldap conf location; fix minor syntax error from last commit

[curcuru]

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

curcuru 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 766324c3 Also fix ldap conf location; fix minor syntax error from last 
commit
766324c3 is described below

commit 766324c348075db27090c0709fbea490d2da3234
Author: Shane Curcuru <a...@shanecurcuru.org>
AuthorDate: Thu Jan 19 12:32:25 2023 -0500

    Also fix ldap conf location; fix minor syntax error from last commit
---
 config/setupmymac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/setupmymac b/config/setupmymac
index b9dbc0e1..fd827c32 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -530,7 +530,7 @@ then
   restart_apache = true
 end
 
-confd_source = "#{WHIMSY}/config/25-authz_ldap_group_membership.conf"
+confd_source = "#{WHIMSY}/docker-config/25-authz_ldap_group_membership.conf"
 confd_target = '/private/etc/apache2/other/25-authz_ldap_group_membership.conf'
 if
   not File.exist?(confd_target) or
@@ -624,7 +624,7 @@ end
 ### Start Apache httpd
 
 if $root and not $apache_would_have_been_restarted
-  unless `launchctl list`.include? 'org.apache.httpd'
+  if not `launchctl list`.include? 'org.apache.httpd'
     run "launchctl load -w 
/System/Library/LaunchDaemons/org.apache.httpd.plist"
   elsif restart_apache
     run "apachectl restart"