passenger 5.3.5 → 5.3.6

data/dev/configkit-schemas/update_schema_inline_comments.rb

@@ -1,118 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../../src/ruby_supportlib/phusion_passenger/utils/json'
-
-SimpleJSON = PhusionPassenger::Utils::JSON
-
-FILES = Dir['src/**/*.{h,cpp}']
-SCHEMAS = SimpleJSON.parse(File.read('dev/configkit-schemas/index.json'))
-
-def main
-  FILES.each do |path|
-    update_file(path)
-  end
-end
-
-def update_file(path)
-  content = File.open(path, 'r:utf-8') do |f|
-    f.read
-  end
-  orig_content = content.dup
-
-  pos = 0
-
-  while match_begin = /^(.*?)BEGIN ConfigKit schema: (.+)/.match(content, pos)
-    if match_end = /END/.match(content, match_begin.end(0))
-      prefix = match_begin.captures[0]
-      class_name = match_begin.captures[1]
-      replacement = format_inline_comment_for_schema(prefix, class_name)
-
-      content[match_begin.begin(0) .. match_end.end(0) - 1] = replacement
-      pos = match_begin.begin(0) + replacement.size
-    else
-      break
-    end
-  end
-
-  if content != orig_content
-    puts "Updating #{path}"
-    File.open(path, 'w:utf-8') do |f|
-      f.write(content)
-    end
-  end
-end
-
-def format_inline_comment_for_schema(prefix, class_name)
-  lines = [
-    "BEGIN ConfigKit schema: #{class_name}",
-    "(do not edit: following text is automatically generated",
-    "by 'rake configkit_schemas_inline_comments')",
-    ""
-  ]
-
-  if schema = SCHEMAS[class_name]
-    table = []
-    schema.each_pair do |key, info|
-      table << [
-        key,
-        info['type'],
-        info['required'] ? 'required' : '-',
-        format_option_names(info)
-      ]
-    end
-
-    column_lengths = find_max_column_lengths(table)
-    table.each do |row|
-      fmt = "  %-#{column_lengths[0]}s   %-#{column_lengths[1]}s   %-#{column_lengths[2]}s   %-#{column_lengths[3]}s"
-      lines << sprintf(fmt, *row)
-    end
-  else
-    lines << "(unknown: #{class_name} not in dev/configkit-schemas/index.json"
-    lines << " Please run:"
-    lines << "   touch src/schema_printer/SchemaPrinterMain.cpp.cxxcodebuilder"
-    lines << "   rake configkit_schemas_inline_comments"
-    lines << ")"
-  end
-
-  lines << ""
-  lines << "END"
-  lines.map{ |x| "#{prefix}#{x}".rstrip }.join("\n")
-end
-
-def format_option_names(schema_entry)
-  options = []
-  if schema_entry['has_default_value']
-    if schema_entry['has_default_value'] == 'static'
-      desc = format_default_value_desc(schema_entry['default_value'])
-      options << "default(#{desc})"
-    else
-      options << 'default'
-    end
-  end
-  options << 'secret' if schema_entry['secret']
-  options << 'read_only' if schema_entry['read_only']
-  result = options.join(',')
-  result = '-' if result.empty?
-  result
-end
-
-def format_default_value_desc(value)
-  if value.is_a?(Array) || value.is_a?(Hash)
-    SimpleJSON.generate(value)
-  else
-    SimpleJSON.generate([value]).sub(/\A\[/, '').sub(/\]\Z/, '')
-  end
-end
-
-def find_max_column_lengths(table)
-  lengths = []
-  table.each do |row|
-    row.each_with_index do |col, i|
-      if lengths[i].nil? || lengths[i] < col.size
-        lengths[i] = col.size
-      end
-    end
-  end
-  lengths
-end
-
-main

data/dev/rack.test/config.ru

@@ -1,5 +0,0 @@
-app = lambda do |env|
-  [200, { "Content-Type" => "text/plain" }, ["ok\n"]]
-end
-
-run app

data/dev/rack.test/public/asset.txt

@@ -1 +0,0 @@
-This is a static asset.

data/dev/vagrant/apache_default_site.conf

@@ -1,35 +0,0 @@
-# This file is overwritten by 'vagrant provision'. For the source,
-# see dev/vagrant/apache_default_site.conf in the Phusion Passenger source
-# tree.
-
-<VirtualHost *:8000>
-	# The ServerName directive sets the request scheme, hostname and port that
-	# the server uses to identify itself. This is used when creating
-	# redirection URLs. In the context of virtual hosts, the ServerName
-	# specifies what hostname must appear in the request's Host: header to
-	# match this virtual host. For the default virtual host (this file) this
-	# value is not decisive as it is used as a last resort host regardless.
-	# However, you must set it for any further virtual host explicitly.
-	#ServerName www.example.com
-
-	ServerAdmin webmaster@localhost
-	DocumentRoot /var/www/html
-
-	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-	# error, crit, alert, emerg.
-	# It is also possible to configure the loglevel for particular
-	# modules, e.g.
-	#LogLevel info ssl:warn
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-	# For most configuration files from conf-available/, which are
-	# enabled or disabled at a global level, it is possible to
-	# include a line for only one particular virtual host. For example the
-	# following line enables the CGI configuration for this host only
-	# after it has been globally disabled with "a2disconf".
-	#Include conf-available/serve-cgi-bin.conf
-</VirtualHost>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

data/dev/vagrant/apache_passenger.conf

@@ -1,5 +0,0 @@
-<IfModule mod_passenger.c>
-  PassengerRoot /vagrant
-  PassengerDefaultRuby /usr/bin/ruby
-  PassengerLogLevel 1
-</IfModule>

data/dev/vagrant/apache_passenger.load

@@ -1 +0,0 @@
-LoadModule passenger_module /vagrant/buildout/apache2/mod_passenger.so

data/dev/vagrant/apache_ports.conf

@@ -1,24 +0,0 @@
-# This file is overwritten by 'vagrant provision'. For the source,
-# see dev/vagrant/apache_ports.conf in the Phusion Passenger source
-# tree.
-
-# If you just change the port or add more ports here, you will likely also
-# have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default.conf
-
-Listen 8000
-Listen 8001
-Listen 8002
-Listen 8003
-Listen 8004
-Listen 8005
-
-<IfModule ssl_module>
-	Listen 8010
-</IfModule>
-
-<IfModule mod_gnutls.c>
-	Listen 8010
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

data/dev/vagrant/apache_rack_test.conf

@@ -1,9 +0,0 @@
-<VirtualHost *:8001>
-	ServerName rack.test
-	DocumentRoot /vagrant/dev/rack.test/public
-	<Directory /vagrant/dev/rack.test/public>
-		Allow from all
-		Options -MultiViews
-		Require all granted
-	</Directory>
-</VirtualHost>

data/dev/vagrant/bashrc

@@ -1,23 +0,0 @@
-# This file is overwritten by 'vagrant provision'. For the source,
-# see dev/vagrant/bashrc in the Phusion Passenger source
-# tree.
-
-# Display git branch in bash prompt.
-export PS1='\[\e]0;\u@\h: \w\a\]${debian_chroot:+($debian_chroot)}\u@\h:\w$(__git_ps1 " (%s)")]\$ '
-
-# Add Phusion Passenger command line tools to PATH.
-export PATH=/vagrant/bin:$PATH
-
-# Tell Phusion Passenger's build system to use ccache.
-export USE_CCACHE=1
-export CCACHE_COMPRESS=1
-
-# Tell Phusion Passenger Standalone to run in debug mode.
-export PASSENGER_DEBUG=1
-
-export PASSENGER_VAGRANT_ENVIRONMENT=1
-
-alias ls='ls -Fh --color'
-alias dir='ls -l'
-alias free='free -m'
-alias df='df -h'

data/dev/vagrant/nginx.conf

@@ -1,39 +0,0 @@
-daemon off;
-worker_processes  1;
-#user  nobody;
-#error_log  logs/error.log debug;
-#pid        logs/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
-    #gzip  on;
-
-    passenger_root /vagrant;
-    passenger_ruby /usr/bin/ruby;
-    passenger_log_level 1;
-
-    server {
-        listen       8100;
-        server_name  localhost;
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-    }
-
-    server {
-        listen 8101;
-        server_name rack.test;
-        root /vagrant/dev/rack.test/public;
-        passenger_enabled on;
-    }
-}

data/dev/vagrant/nginx_rakefile

@@ -1,33 +0,0 @@
-ENV['CC']  ||= 'ccache cc'
-ENV['CXX'] ||= 'ccache c++'
-
-desc "Bootstrap Nginx for the first time"
-task :bootstrap => :configure do
-  sh "make -j2"
-  sh "make install"
-  sh "rm -f inst/sbin/nginx"
-  puts
-  puts "--------------------------"
-  puts "You're all set! You can start Nginx by running:"
-  puts
-  puts "  ./start"
-  puts
-  puts "Nginx can be reached from the host machine on http://127.0.0.1:8100/"
-  puts
-  puts "You never have to run `rake bootstrap` again. You also never have to " +
-    "run `make install`. If you've made changes to the Passenger Nginx module, " +
-    "simply run `make && ./start` in /home/vagrant/nginx. The `start` script " +
-    "will start the newly compiled Nginx binary directly."
-end
-
-desc "Configure Nginx source tree"
-task :configure do
-  sh "./configure --prefix=/home/vagrant/nginx/inst" +
-    " --add-module=/vagrant/src/nginx_module" +
-    " --with-http_ssl_module" +
-    " --with-http_gzip_static_module" +
-    " --with-http_stub_status_module" +
-    " --with-http_v2_module" +
-    " --with-debug"
-  sh "sed", "-E", "-i", 's/ -O[0-9]? / -ggdb /g', "objs/Makefile"
-end

data/dev/vagrant/nginx_start

@@ -1,32 +0,0 @@
-#!/usr/bin/ruby
-# This file is overwritten by 'vagrant provision'. For the source,
-# see dev/vagrant/nginx_start in the Phusion Passenger source
-# tree.
-
-ENV['PASSENGER_BEEP_ON_ABORT'] = '1'
-
-def run_in_bg(*command)
-  return fork do
-    Process.setsid
-    exec(*command)
-  end
-end
-
-File.open('inst/logs/error.log', 'a') do |f|
-  f.write("\n\n\n\n-------------- NGINX START #{Time.now} --------------\n\n\n\n")
-end
-
-tail_pid = run_in_bg("tail -n 0 -f inst/logs/error.log")
-nginx_pid = run_in_bg("./objs/nginx", *ARGV)
-begin
-  Process.waitpid(nginx_pid)
-  nginx_pid = nil
-rescue Interrupt
-ensure
-  Process.kill('INT', tail_pid)
-  Process.waitpid(tail_pid)
-  if nginx_pid
-    Process.kill('INT', nginx_pid)
-    Process.waitpid(nginx_pid)
-  end
-end

data/dev/vagrant/provision.sh

@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-set -o pipefail
-
-
-### Update /etc/hosts
-
-if ! grep -q passenger.test /etc/hosts; then
-	cat >>/etc/hosts <<-EOF
-
-127.0.0.1 passenger.test
-127.0.0.1 mycook.passenger.test
-127.0.0.1 zsfa.passenger.test
-127.0.0.1 norails.passenger.test
-127.0.0.1 1.passenger.test 2.passenger.test 3.passenger.test
-127.0.0.1 4.passenger.test 5.passenger.test 6.passenger.test
-127.0.0.1 7.passenger.test 8.passenger.test 9.passenger.test
-127.0.0.1 rack.test foobar.test
-	EOF
-fi
-
-
-### Update bashrc and bash profile
-
-if ! grep -q bashrc.mine /etc/bash.bashrc; then
-	echo ". /etc/bash.bashrc.mine" >> /etc/bash.bashrc
-fi
-if ! grep -q bashrc.mine /home/vagrant/.bashrc; then
-	echo ". /etc/bash.bashrc.mine" >> /home/vagrant/.bashrc
-fi
-if ! grep -q /vagrant /home/vagrant/.profile; then
-	echo "if tty -s; then cd /vagrant; fi" >> /home/vagrant/.profile
-fi
-cp /vagrant/dev/vagrant/bashrc /etc/bash.bashrc.mine
-cp /vagrant/dev/vagrant/sudoers.conf /etc/sudoers.d/passenger
-chmod 440 /etc/sudoers.d/passenger
-
-
-### Install native dependencies
-
-apt-get update
-apt-get install -y build-essential git bash-completion ccache wget \
-	libxml2-dev libxslt1-dev libsqlite3-dev libcurl4-openssl-dev libpcre3-dev \
-	ruby ruby-dev nodejs npm \
-	apache2-mpm-worker apache2-threaded-dev
-
-
-### Install basic gems
-
-if [[ ! -e /usr/local/bin/rake ]]; then
-	gem install rake --no-rdoc --no-ri
-fi
-if [[ ! -e /usr/local/bin/drake ]]; then
-	gem install drake --no-rdoc --no-ri
-fi
-if [[ ! -e /usr/local/bin/bundler ]]; then
-	gem install bundler --no-rdoc --no-ri
-fi
-
-
-### Install Phusion Passenger development dependencies
-
-pushd /vagrant
-if [[ ! -e ~/.test_deps_installed ]]; then
-	rake test:install_deps SUDO=1 DEPS_TARGET=~/bundle
-	touch ~/.test_deps_installed
-else
-	bundle install --path ~/bundle
-fi
-popd
-
-
-### Install Nginx source code
-
-pushd /home/vagrant
-if [[ ! -e nginx ]]; then
-	sudo -u vagrant -H git clone -b branches/stable-1.6 https://github.com/nginx/nginx.git
-fi
-sudo -u vagrant -H mkdir -p nginx/inst/conf
-sudo -u vagrant -H cp /vagrant/dev/vagrant/nginx_start nginx/start
-if [[ ! -e nginx/Rakefile ]]; then
-	sudo -u vagrant -H cp /vagrant/dev/vagrant/nginx_rakefile nginx/Rakefile
-fi
-if [[ ! -e nginx/inst/conf/nginx.conf ]]; then
-	sudo -u vagrant -H cp /vagrant/dev/vagrant/nginx.conf nginx/inst/conf/
-fi
-if [[ ! -e nginx/nginx.conf && ! -h nginx/nginx.conf ]]; then
-	sudo -u vagrant -H ln -s inst/conf/nginx.conf nginx/nginx.conf
-fi
-if [[ ! -e nginx/access.log && ! -h nginx/access.log ]]; then
-	sudo -u vagrant -H ln -s inst/logs/access.log nginx/access.log
-fi
-if [[ ! -e nginx/error.log && ! -h nginx/error.log ]]; then
-	sudo -u vagrant -H ln -s inst/logs/error.log nginx/error.log
-fi
-popd
-
-
-### Set up Apache
-
-should_restart_apache=false
-cp /vagrant/dev/vagrant/apache_ports.conf /etc/apache2/ports.conf
-cp /vagrant/dev/vagrant/apache_default_site.conf /etc/apache2/sites-available/000-default.conf
-if [[ ! -e /etc/apache2/mods-available/passenger.conf ]]; then
-	cp /vagrant/dev/vagrant/apache_passenger.conf /etc/apache2/mods-available/passenger.conf
-fi
-if [[ ! -e /etc/apache2/mods-available/passenger.load ]]; then
-	cp /vagrant/dev/vagrant/apache_passenger.load /etc/apache2/mods-available/passenger.load
-fi
-if [[ ! -e /etc/apache2/sites-available/010-rack.test.conf ]]; then
-	cp /vagrant/dev/vagrant/apache_rack_test.conf /etc/apache2/sites-available/010-rack.test.conf
-	a2ensite 010-rack.test
-	should_restart_apache=true
-fi
-if $should_restart_apache; then
-	service apache2 restart
-fi