Commit 546f953633636e47bdf177e7f65eddb8a3b08455:
Merge branch 'master' of github.com:apache/whimsy
Branch: refs/heads/master
Author: Sam Ruby <[email protected]>
Committer: Sam Ruby <[email protected]>
Pusher: rubys <[email protected]>
------------------------------------------------------------
lib/whimsy/asf/ldap.rb | + -
www/status/passenger.cgi | +++++++++++
------------------------------------------------------------
23 changes: 22 additions, 1 deletions.
------------------------------------------------------------
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 33948c7..bd24245 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -76,7 +76,7 @@ def self.connect
def self.init_ldap
return @ldap if @ldap
@mtime = Time.now
- @ldap = ASF::LDAP.init
+ @ldap = ASF::LDAP.connect
end
# determine where ldap.conf resides
diff --git a/www/status/passenger.cgi b/www/status/passenger.cgi
new file mode 100755
index 0000000..f06cf95
--- /dev/null
+++ b/www/status/passenger.cgi
@@ -0,0 +1,21 @@
+#!/usr/local/bin/ruby2.3.0
+
+require 'open3'
+output, error, status = Open3.capture3 '/usr/local/bin/ruby2.3.0',
+ Gem.bin_path('passenger', 'passenger-status')
+
+require 'wunderbar'
+_html do
+ _h1 'Phusion Passenger Status'
+ _pre output
+
+ unless error.empty?
+ _h2 'STDERR'
+ _pre error
+ end
+
+ unless status.success?
+ _h2 'Status'
+ _pre status
+ end
+end
