passenger 4.0.48 → 4.0.49

data/packaging/rpm/nginx_spec/nginx.sysconfig

@@ -0,0 +1,4 @@
+# Configuration file for the nginx service
+
+# set this to the location of the nginx configuration file
+NGINX_CONF_FILE=/etc/nginx/nginx.conf

data/packaging/rpm/nginx_spec/passenger.conf

@@ -0,0 +1,9 @@
+# To enable the Phusion Passenger application server (www.phusionpassenger.com),
+# install the following package:
+#
+#   yum install passenger
+#
+# Then uncomment these options:
+
+#passenger_root PASSENGER_ROOT;
+#passenger_ruby /usr/bin/ruby;

data/{rpm → packaging/rpm/passenger_spec}/passenger.spec.template

@@ -1,13 +1,25 @@
-%global package_name <%= RPM_NAME %>
-%global namespace <%= GLOBAL_NAMESPACE_DIRNAME %>
-%global nginx_version <%= PREFERRED_NGINX_VERSION %>
+# Based on http://pkgs.fedoraproject.org/cgit/rubygem-passenger.git/tree/
+
+%global package_name <%= PASSENGER_RPM_NAME %>
+%global package_version <%= PASSENGER_RPM_VERSION %>
+%global package_release <%= PASSENGER_RPM_RELEASE %>
+%global tarball_name <%= PASSENGER_TARBALL_NAME %>
+%global tarball_version <%= PASSENGER_VERSION %>
+%global apache_module_package_name <%= PASSENGER_APACHE_MODULE_RPM_NAME %>
+%global namespace <%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>
+%global nginx_version <%= NGINX_RPM_VERSION %>
 %global bundled_boost_version 1.54.0
+%global is_enterprise <%= enterprise? ? 1 : 0 %>
+%global release_dist .<%= @distribution %>
 
+# Fedora <= 18 and RHEL <= 6 used the rubyabi requirement.
+# This is gone in later versions.
 %if 0%{?fc18}
+%global uses_rubyabi 1
 %global rubyabi 1.9.1
 %endif
-
 %if 0%{?el6}
+%global uses_rubyabi 1
 %global rubyabi 1.8
 %endif
 
@@ -17,10 +29,10 @@
 %{!?gem_extdir: %global gem_extdir %{gem_instdir}/extdir}
 
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)}}
-%{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_confdir:     %{expand: %%global _httpd_confdir     %%{_sysconfdir}/httpd/conf.d}}
 # /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
-%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
-%{!?_httpd_moddir:    %{expand: %%global _httpd_moddir    %%{_libdir}/httpd/modules}}
+%{!?_httpd_modconfdir:  %{expand: %%global _httpd_modconfdir  %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_moddir:      %{expand: %%global _httpd_moddir      %%{_libdir}/httpd/modules}}
 
 %global ruby_dir_version %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]')
 %global ruby_arch_name %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["arch"]')
@@ -32,8 +44,8 @@
 
 Summary: Phusion Passenger application server
 Name: %{package_name}
-Version: 4.0.33
-Release: 1%{?dist}
+Version: %{package_version}
+Release: %{package_release}%{?release_dist}
 Group: System Environment/Daemons
 # Passenger code uses MIT license.
 # Bundled(Boost) uses Boost Software License
@@ -44,7 +56,7 @@ License: Boost and BSD and BSD with advertising and MIT and zlib
 URL: https://www.phusionpassenger.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: http://s3.amazonaws.com/phusion-passenger/releases/passenger-%{version}.tar.gz
+Source: http://s3.amazonaws.com/phusion-passenger/releases/%{tarball_name}-%{tarball_version}.tar.gz
 Source1: http://nginx.org/download/nginx-%{nginx_version}.tar.gz
 Source10: passenger.logrotate
 Source11: apache-passenger.conf.in
@@ -68,21 +80,21 @@ Requires: rubygems
 Requires: rubygem(daemon_controller) >= 1.1.0
 Requires: rubygem(rack)
 Requires: rubygem(rake)
-%if 0%{?fedora} >= 19
-Requires: ruby(release)
-%else
+%if 0%{?uses_rubyabi}
 Requires: ruby(abi) = %{rubyabi}
+%else
+Requires: ruby(release)
 %endif
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires:  libcurl-devel
+BuildRequires: libcurl-devel
 %else
-BuildRequires:  curl-devel
+BuildRequires: curl-devel
 %endif
 
 %if 0%{?rhel} < 6 && 0%{?fedora} <= 16
 Requires: rubygem(fastthread) >= 1.0.1
-BuildRequires:  rubygem(fastthread) >= 1.0.1
+BuildRequires: rubygem(fastthread) >= 1.0.1
 %endif
 
 BuildRequires: httpd-devel
@@ -104,6 +116,13 @@ Obsoletes: rubygem-passenger < 4.0.33
 Obsoletes: rubygem-passenger%{_isa} < 4.0.33
 Obsoletes: rubygem-passenger-native < 4.0.33
 Obsoletes: rubygem-passenger-native%{?_isa} < 4.0.33
+%if %{is_enterprise}
+Obsoletes: passenger
+Conflicts: passenger-devel
+Conflicts: passenger-doc
+Conflicts: passenger-native-libs
+Conflicts: mod_passenger
+%endif
 
 %description
 Phusion Passenger® is a web server and application server, designed to be fast, robust
@@ -111,15 +130,18 @@ and lightweight. It takes a lot of complexity out of deploying web apps, adds po
 enterprise-grade features that are useful in production, and makes administration much
 easier and less complex. It supports Ruby, Python, Node.js and Meteor.
 
-%package -n mod_passenger
+%package -n %{apache_module_package_name}
 Summary: Apache Module for Phusion Passenger
 Group: System Environment/Daemons
 BuildRequires:  httpd-devel
 Requires: httpd-mmn = %{_httpd_mmn}
 Requires: %{package_name} = %{version}-%{release}
+%if %{is_enterprise}
+Obsoletes: mod_passenger
+%endif
 License: Boost and BSD and BSD with advertising and MIT and zlib
 
-%description -n mod_passenger
+%description -n %{apache_module_package_name}
 This package contains the pluggable Apache server module for Phusion Passenger®.
 
 %package devel
@@ -129,6 +151,9 @@ Requires: %{package_name}%{?_isa} = %{version}-%{release}
 Provides: bundled(boost-devel) = %{bundled_boost_version}
 Obsoletes: rubygem-passenger-devel < 4.0.33
 Obsoletes: rubygem-passenger-devel%{?_isa} < 4.0.33
+%if %{is_enterprise}
+Obsoletes: passenger-devel
+%endif
 License: Boost and BSD and BSD with advertising and GPL+ and MIT and zlib
 
 %description devel
@@ -141,6 +166,9 @@ Summary: Phusion Passenger documentation
 Group: System Environment/Daemons
 Requires: %{package_name} = %{version}-%{release}
 Obsoletes: rubygem-passenger-doc < 4.0.33
+%if %{is_enterprise}
+Obsoletes: passenger-doc
+%endif
 BuildArch: noarch
 License: CC-BY-SA and MIT and (MIT or GPL+)
 
@@ -154,6 +182,9 @@ Requires: %{package_name}%{?_isa} = %{version}-%{release}
 Requires: ruby
 Obsoletes: rubygem-passenger-native-libs < 4.0.33
 Obsoletes: rubygem-passenger-native-libs%{?_isa} < 4.0.33
+%if %{is_enterprise}
+Obsoletes: passenger-native-libs
+%endif
 License: Boost and BSD and BSD with advertising and MIT and zlib
 %description native-libs
 This package contains Phusion Passenger® native extensions for Ruby.
@@ -162,7 +193,7 @@ necessitates rebuilding this package.
 
 
 %prep
-%setup -q -n %{package_name}-%{version}
+%setup -q -n %{tarball_name}-%{tarball_version}
 tar xzf %{SOURCE1}
 
 %patch2   -p1 -b .include-sys-types
@@ -186,6 +217,7 @@ export EXTRA_CFLAGS=`echo "$EXTRA_CFLAGS" | sed 's|-O2|-O|g'`
 export EXTRA_CXXFLAGS=`echo "$EXTRA_CXXFLAGS" | sed 's|-O2|-O|g'`
 
 export USE_VENDORED_LIBEV=false
+export CACHING=false
 
 # Speed up ccache (reduce I/O) by lightly compressing things.
 # Always set these variables because pbuilder uses ccache transparently.
@@ -269,15 +301,11 @@ export CCACHE_COMPRESS_LEVEL=3
 # wrong. We therefore do not make failures fatal, although the result
 # should still be checked.
 %{__cp} %{SOURCE12} test/config.json
-rake test:cxx || true
+# rake test:cxx || true
 
 %files
-%doc "%{_docdir}/%{namespace}/Users guide.html"
-%doc "%{_docdir}/%{namespace}/Users guide Nginx.html"
-%doc "%{_docdir}/%{namespace}/Users guide Apache.html"
-%doc "%{_docdir}/%{namespace}/Users guide Standalone.html"
-%{_bindir}
-%{_sbindir}
+%{_bindir}/*
+%{_sbindir}/*
 %{_libdir}/%{namespace}/PassengerWebHelper
 %{_libdir}/%{namespace}/agents
 %{_datadir}/%{namespace}/helper-scripts
@@ -289,11 +317,11 @@ rake test:cxx || true
 %{_datadir}/%{namespace}/*.txt
 %dir %{_localstatedir}/log/passenger-analytics
 %{_sysconfdir}/logrotate.d/passenger
-%{_mandir}
-%{passenger_ruby_libdir}
+%{_mandir}/*/*
+%{passenger_ruby_libdir}/*
 
 %files doc
-%doc %{_docdir}/%{namespace}
+%{_docdir}/%{namespace}/*
 
 %files devel
 %{_datadir}/%{namespace}/ngx_http_passenger_module
@@ -301,12 +329,11 @@ rake test:cxx || true
 %{_datadir}/%{namespace}/include
 %{_libdir}/%{namespace}/common
 
-%files -n mod_passenger
+%files -n %{apache_module_package_name}
 %config(noreplace) %{_httpd_modconfdir}/*.conf
 %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
     %config(noreplace) %{_httpd_confdir}/*.conf
 %endif
-%doc "%{_docdir}/%{namespace}/Users guide Apache.html"
 %{_httpd_moddir}/mod_passenger.so
 
 %files native-libs

data/packaging/rpm/repo_update

@@ -0,0 +1,114 @@
+#!/bin/bash
+set -e
+
+SELFROOT=`dirname "$0"`
+SELFROOT=`cd "$SELFROOT" && pwd`
+TEMPDIR=
+
+PACKAGE_DIR=
+SIGNING_KEY=
+PASSPHRASE_FILE=
+
+function usage()
+{
+  echo "Usage: ./repo_update [OPTIONS]"
+  echo "Sign RPMs and import them into a YUM repository."
+  echo
+  echo "Required options:"
+  echo "  -p PATH        Path to a project"
+  echo
+  echo "  -r PATH        Directory to RPMs"
+  echo "  -P PATH        Directory to YUM repository"
+  echo
+  echo "  -s KEY         Signing key to use"
+  echo "  -x PATH        File containing signing key passphrase"
+}
+
+function parse_options()
+{
+  local OPTIND=1
+  local opt
+  while getopts "p:r:P:s:x:h" opt; do
+    case "$opt" in
+    p)
+      PACKAGE_DIR="$OPTARG/build"
+      REPO_DIR="$OPTARG/repo"
+      ;;
+    r)
+      PACKAGE_DIR="$OPTARG"
+      ;;
+    P)
+      REPO_DIR="$OPTARG"
+      ;;
+    s)
+      SIGNING_KEY="$OPTARG"
+      ;;
+    x)
+      PASSPHRASE_FILE="$OPTARG"
+      ;;
+    h)
+      usage
+      exit
+      ;;
+    *)
+      return 1
+      ;;
+    esac
+  done
+
+  if [[ "$PACKAGE_DIR" = "" ]]; then
+    echo "Please specify a project using -p, or an RPM package directory using -r."
+    exit 1
+  fi
+  if [[ "$REPO_DIR" = "" ]]; then
+    echo "Please specify a project using -p, or a YUM repo directory using -P."
+    exit 1
+  fi
+  if [[ "$SIGNING_KEY" = "" ]]; then
+    echo "Please specify a signing key using -s."
+    exit 1
+  fi
+  if [[ "$PASSPHRASE_FILE" = "" ]]; then
+    echo "Please specify a passphrase file using -p."
+    exit 1
+  fi
+}
+
+function cleanup()
+{
+  local pids=`jobs -p`
+  set +e
+  if [[ "$pids" != "" ]]; then
+    kill $pids
+  fi
+  if [[ "$TEMPDIR" != "" ]]; then
+    rm -rf "$TEMPDIR"
+  fi
+}
+
+trap cleanup EXIT
+parse_options "$@"
+
+if ! gpg --list-keys "$SIGNING_KEY" >/dev/null 2>/dev/null; then
+  echo "ERROR: signing key $SIGNING_KEY not found."
+  exit 1
+fi
+
+APP_UID=`id -u`
+APP_GID=`id -g`
+TEMPDIR=`mktemp -d /tmp/passenger-rpm.XXXXXXXX`
+gpg --armor --export-secret-keys "$SIGNING_KEY" > "$TEMPDIR/signing_key"
+cat "$PASSPHRASE_FILE" > "$TEMPDIR/signing_passphrase"
+chmod 600 "$TEMPDIR"/*
+
+docker run --rm \
+  -v "$SELFROOT:/system:ro" \
+  -v "$TEMPDIR:/params:ro" \
+  -v "$PACKAGE_DIR:/packages" \
+  -v "$REPO_DIR:/repo" \
+  -e "APP_UID=$APP_UID" \
+  -e "APP_GID=$APP_GID" \
+  -e "SIGNING_KEY=$SIGNING_KEY" \
+  phusion/passenger_rpm_automation \
+  /system/internal/my_init --skip-runit --skip-startup-files --quiet -- \
+  /system/internal/repo_update

data/packaging/rpm/setup-system

@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+
+function create_user()
+{
+  local name="$1"
+  local full_name="$2"
+  local id="$3"
+  create_group $name $id
+  if ! grep -q "^$name:" /etc/passwd; then
+    sudo adduser --uid $id --gid $id --disabled-password --gecos "$full_name" $name
+  fi
+  sudo usermod -L $name
+}
+
+function create_group()
+{
+  local name="$1"
+  local id="$2"
+  if ! grep -q "^$name:" /etc/group >/dev/null; then
+    sudo addgroup --gid $id $name
+  fi
+}
+
+set -x
+
+wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add -
+echo deb http://pkg.jenkins-ci.org/debian binary/ | sudo tee /etc/apt/sources.list.d/jenkins.list
+sudo apt-get update
+sudo apt-get install -y jenkins acl git ca-certificates ruby
+sudo usermod -a -G passenger_ci,docker jenkins
+if [[ -e /vagrant ]]; then
+  sudo service jenkins stop
+  sudo update-rc.d -f jenkins disable
+  if [[ ! -e /srv/passenger_rpm_automation ]]; then
+    sudo ln -s /vagrant /srv/passenger_rpm_automation
+  fi
+fi
+
+create_user psg_rpm_automation "Passenger RPM automation" 2466
+
+create_group passenger_ci 2450
+sudo usermod -a -G passenger_ci,docker psg_rpm_automation
+sudo mkdir -p /var/cache/passenger_ci
+sudo touch /var/cache/passenger_ci/lock
+sudo chown -R root:passenger_ci /var/cache/passenger_ci
+sudo chmod 770 /var/cache/passenger_ci
+sudo chmod 660 /var/cache/passenger_ci/lock
+
+sudo mkdir -p /etc/passenger_rpm_automation
+sudo touch /etc/passenger_rpm_automation/signing_passphrase
+sudo chown jenkins: /etc/passenger_rpm_automation/signing_passphrase
+sudo chmod 600 /etc/passenger_rpm_automation/signing_passphrase
+if [[ ! -e signing_passphrase ]]; then
+  sudo ln -s /etc/passenger_rpm_automation/signing_passphrase signing_passphrase
+fi
+
+if [[ ! -e /tools ]]; then
+  sudo git clone https://github.com/phusion/phusion-server-tools.git /tools
+fi

data/packaging/rpm/shell

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+SELFDIR=`dirname "$0"`
+SELFDIR=`cd "$SELFDIR" && pwd`
+exec docker run --rm --privileged -t -i \
+	-v "$SELFDIR:/system:ro" \
+	"$@" \
+	phusion/passenger_rpm_automation \
+	/system/internal/my_init --skip-runit --skip-startup-files --quiet -- \
+	/bin/bash

data/resources/templates/standalone/config.erb

@@ -85,7 +85,9 @@ http {
     gzip_min_length 150;
     gzip_proxied any;
     gzip_types text/plain text/css text/json text/javascript \
-        application/javascript application/x-javascript application/json;
+        application/javascript application/x-javascript application/json \
+        application/rss+xml application/vnd.ms-fontobject application/x-font-ttf \
+        application/xml font/opentype image/svg+xml text/xml;
     
     <% if @apps.size > 1 %>
     # Default server entry.

data/test/config.json.rpm-automation

@@ -11,5 +11,5 @@
   "nonexistant_uid": 9999,
   "nonexistant_gid": 9999,
 
-  "nginx": "/tmp/nginx/sbin/nginx"
+  "nginx": "/usr/sbin/nginx"
 }