cookbooks/mu-master/recipes/default.rb in cloud-mu-2.0.0.pre.alpha9 vs cookbooks/mu-master/recipes/default.rb in cloud-mu-2.0.0.pre.beta1

- old
+ new

@@ -237,10 +237,11 @@ node.normal['postfix']['main']['myorigin'] = "platform-mu" end node.normal['postfix']['main']['inet_interfaces'] = "all" node.save + mubranch=`cd #{MU_BASE}/lib && git rev-parse --abbrev-ref HEAD` # ~FC048 file "/var/www/html/index.html" do owner "apache" group "apache" content " @@ -252,11 +253,11 @@ </p> <p> <a href='https://#{MU.mu_public_addr}/jenkins/'>Jenkins interface GUI</a> </p> <p> - <a href='http://#{MU.mu_public_addr}/docs/frames.html'>Mu API documentation</a> + <a href='#{(mubranch.nil? or mubranch == "master" or mubranch.match(/detached from/)) ? "https://cloudamatic.gitlab.io/mu/" : "http://"+MU.mu_public_addr+"/docs"}'>Mu API documentation</a> </p> " end execute "echo 'devnull: /dev/null' >> /etc/aliases" do @@ -428,12 +429,10 @@ This is a Mu Master server. Mu is installed in #{MU.myRoot}. Nagios monitoring GUI: https://#{MU.mu_public_addr}/nagios/ - Jenkins interface GUI: https://#{MU.mu_public_addr}/jenkins/ - - Mu API documentation: http://#{MU.mu_public_addr}/docs/frames.html + Mu API documentation: #{(mubranch.nil? or mubranch == "master" or mubranch.match(/detached from/)) ? "https://cloudamatic.gitlab.io/mu/" : "http://"+MU.mu_public_addr+"/docs"} Mu metadata are stored in #{MU.mainDataDir} Users: #{node['mu']['user_list'].join(", ")}