passenger 3.0.14 → 3.0.15

data/lib/phusion_passenger/templates/error_layout.html.erb

@@ -14,8 +14,8 @@
 
 	<div id="site_container">
 		<div id="site_header">
-			<ul class="corporate_identity <% if @enterprisey %>enterprise_edition<% end %>">
-				<li class="logo"><a href="http://www.modrails.com"><span>Phusion Passenger</span></a></li>
+			<ul class="corporate_identity">
+				<li class="logo"><a href="https://www.phusionpassenger.com"><span>Phusion Passenger</span></a></li>
 			</ul>
 		</div>
 		<div id="site_body">
@@ -28,8 +28,8 @@
 			   text. Thank you.
 			-->
 			<div class="container">
-				Powered by <a href="http://www.modrails.com/">Phusion Passenger</a><% if @enterprisey %> (Enterprise Edition)<% end %>,
-				<tt>mod_rails</tt> / <tt>mod_rack</tt> for Apache.
+				Powered by <a href="https://www.phusionpassenger.com/">Phusion Passenger</a>,
+				<tt>mod_rails</tt> / <tt>mod_rack</tt> for Apache and Nginx.
 			</div>
 		</div>
 	</div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 3
   - 0
-  - 14
-  version: 3.0.14
+  - 15
+  version: 3.0.15
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-22 00:00:00 Z
+date: 2012-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -88,7 +88,6 @@ executables:
 - passenger-config
 - passenger-status
 - passenger-memory-stats
-- passenger-make-enterprisey
 extensions: []
 
 extra_rdoc_files: []
@@ -228,7 +227,6 @@ files:
 - bin/passenger-config
 - bin/passenger-install-apache2-module
 - bin/passenger-install-nginx-module
-- bin/passenger-make-enterprisey
 - bin/passenger-memory-stats
 - bin/passenger-status
 - doc/ApplicationPool algorithm.txt
@@ -293,7 +291,6 @@ files:
 - doc/users_guide_snippets/tips.txt
 - doc/users_guide_snippets/under_the_hood/page_caching_support.txt
 - man/passenger-config.1
-- man/passenger-make-enterprisey.8
 - man/passenger-memory-stats.8
 - man/passenger-status.8
 - man/passenger-stress-test.1

data/bin/passenger-make-enterprisey

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
-#
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-source_root = File.expand_path(File.dirname(__FILE__) + "/..")
-$LOAD_PATH.unshift("#{source_root}/lib")
-require 'phusion_passenger'
-require 'digest/md5'
-
-##############################################################################
-#
-#  Hidden license
-# 
-#  By reading the source code of this file, you're automatically agreeing
-#  with the following conditions:
-#  
-#  1. You will sell your soul to us for $0.
-#  2. You will watch the movie "Hot Fuzz".
-#  
-#  [ Allow ]    or    [ Deny ]
-#  
-##############################################################################
-
-
-
-
-include PhusionPassenger
-trap("INT") { exit 1 }
-if File.exist?("#{SOURCE_ROOT}/enterprisey.txt") || File.exist?("/etc/passenger_enterprisey.txt")
-	puts "Congratulations, your Passenger Enterprise License has already been activated!"
-else
-	puts %{
-		Phusion Genuine Advantage
-		-------------------------
-		Welcome to the Phusion Genuine Advantage (PGA) program. This program will help
-		you with activating your Passenger Enterprise License.
-		
-		Please enter your Enterprise License Key:
-	}.gsub(/^\t\t/, '').strip
-	done = false
-	while !done
-		key = STDIN.readline.strip
-		if key == Digest::MD5.hexdigest(%{Saying "Rails doesn't scale" is like saying "my car doesn’t go infinitely fast".})
-			done = true
-		else
-			STDERR.puts "Invalid key given. Please try again:"
-		end
-	end
-	if PhusionPassenger.natively_packaged?
-		enterprise_file = "/etc/passenger_enterprisey.txt"
-	else
-		enterprise_file = "#{SOURCE_ROOT}/enterprisey.txt"
-	end
-	if system("touch", enterprise_file)
-		puts "Congratulations! Your Passenger Enterprise License has been activated!"
-		puts "Please restart Apache or Nginx to take full advantage of your Enterprise License."
-	else
-		STDERR.puts "Could not write to the Passenger folder. Please run this tool as root."
-		exit 1
-	end
-end

data/man/passenger-make-enterprisey.8

@@ -1,23 +0,0 @@
-.TH "passenger-make-enterprisey" "8" "2.0" "Phusion Passenger" "Adminstration Commands"
-.SH "NAME"
-.LP 
-passenger\-make-enterprisey \- activate your Phusion passenger enterprise licence
-.SH "SYNOPSIS"
-.LP 
-\fBpassenger\-make\-enterprisey
-.SH "DESCRIPTION"
-.LP 
-\fBpassenger\-make\-enterprisey\fR changes your ordinary everyday version of Phusion Passenger into a special enterprise version just as soon as you type in your licence key.
-.LP
-As everybody working at enterprise level knows, enterprise software is so much better in every possible way. So make sure you pick up your licence key today.
-.SH "SEE ALSO"
-Phusion Passenger Enterprise Programme (http://www.modrails.com/enterprise.html)
-.SH "AUTHOR"
-.LP 
-Phusion Passenger is written by Phusion (http://www.phusion.nl)
-.LP 
-"Phusion" and "Phusion Passenger" are trademarks of Hongli Lai & Ninh Bui.
-.LP 
-This manual page was written by Neil Wilson <neil@brightbox.co.uk> for the Ubuntu project (but may be used by others). 
-.SH "CAVEATS"
-Whatever you do don't look at the source code.