[whimsy] branch master updated: Move :config and LDAP.configure after update

[sebb]

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 bb651f0  Move :config and LDAP.configure after update
bb651f0 is described below

commit bb651f0c2698d0fc1321d209cfe38a4e34dbaf33
Author: Sebb <s...@apache.org>
AuthorDate: Sun Dec 1 19:03:19 2019 +0000

    Move :config and LDAP.configure after update
---
 Rakefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2123d71..2ac81e2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -78,6 +78,7 @@ task :pristine do
   Rake::Task[:update].invoke('pristine')
 end
 
+# This requires Gems such as Wunderbar to have been set up
 task :config do
   $LOAD_PATH.unshift '/srv/whimsy/lib'
   require 'whimsy/asf/config'
@@ -317,7 +318,8 @@ namespace :docker do
     end
   end
 
-  task :scaffold => :config do
+  # cannot depend on :config
+  task :scaffold do
     # set up symlinks from /root to user's home directory
     home = ENV['HOST_HOME']
     if home and File.exist? home
@@ -355,12 +357,13 @@ namespace :docker do
     mkdir_p? '/srv/mail/secretary'
     # there may be more
 
+  end
+
+  task :entrypoint => [:scaffold, :config] do
+    # requires :config
     unless File.read(File.join(ASF::ETCLDAP,'ldap.conf')).include? 
'asf-ldap-client.pem'
       sh 'ruby -I lib -r whimsy/asf -e "ASF::LDAP.configure"'
     end
-  end
-
-  task :entrypoint => :scaffold do
     sh 'apache2ctl -DFOREGROUND'
   end
 end