pkgr 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6953d1856b4cb7378d7465a3cfb0bc8f7e21ce7
-  data.tar.gz: 4416c2783fe73bc50d797d99e64e178e183dc04e
+  metadata.gz: 88515b775ce0780722e7b2cf547a055eb389d2b1
+  data.tar.gz: 90ea8f15d716c46d2a2ae12a0cfaa77b1ecd5d9c
 SHA512:
-  metadata.gz: 4ebeee46be1c87ce49ef306362a2f2da56007a121c2eaef55300837421a145241c51468652d8353329cdd8789777565d375fcea015012972ccf802e6dac6c33b
-  data.tar.gz: dafa9e7fc52334d49b2b536b5b0fbd253cd7ab0a5b5be6d41c190b2139ec7c05d994c1ba5a42b113e3299ef3cfebdf615d0696a049a981715c1825a7aeff268a
+  metadata.gz: 8574750422452b0efe2a75d4be2703ccac4a8c33c8936c0b781928d25092a1dced9e07f6eb7fc8e92765292043fa30dbb5a59ea3e60658c67573c9b64ac5be0d
+  data.tar.gz: 1d730a9380f3c66a79f4e596e623028fd0e7637bb559da47b22d35b81f9fea2a184c2cb98878198b6b07e32cfcfafbc91afb5fccc45950844a2ceb215a2ed89e

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Cyril Rohr
+Copyright (c) 2012-2017 Cyril Rohr
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,12 +1,16 @@
 # pkgr
 
+[![Build Status](https://travis-ci.org/crohr/pkgr.svg?branch=master)](https://travis-ci.org/crohr/pkgr)
+
 ## Goal
 
 Make debian or rpm packages out of any app, including init script, crons,
 logrotate, etc. Excellent way to distribute apps or command line tools without
 complicated installation instructions.
 
-Hosted service available at <https://packager.io/>. Free for OpenSource apps.
+Hosted service available at [Packager.io][packager-io]. Free for OpenSource apps.
+
+[packager-io]: https://packager.io/
 
 ## Officially supported languages
 
@@ -15,8 +19,9 @@ Hosted service available at <https://packager.io/>. Free for OpenSource apps.
 * Python
 * Go
 
-You can also try out PHP support by specifying the following buildpack:
-`https://github.com/pkgr/heroku-buildpack-php#buildcurl`
+In beta:
+
+* PHP, using the following buildpack: `https://github.com/pkgr/heroku-buildpack-php#buildcurl`
 
 You can also point to other buildpacks
 ([doc](https://packager.io/documentation/customizing-the-build/#buildpack)).
@@ -27,6 +32,7 @@ They may just work.
 * Ubuntu 16.04 ("xenial")
 * Ubuntu 14.04 ("trusty")
 * Ubuntu 12.04 ("precise")
+* Debian 9 ("stretch")
 * Debian 8 ("jessie")
 * Debian 7 ("wheezy")
 * RHEL/CentOS 7
@@ -38,7 +44,7 @@ They may just work.
 
 ## Examples
 
-See <https://packager.io/> for examples of apps packaged with `pkgr` (Gitlab, OpenProject, Discourse, etc.).
+See [Packager.io][packager-io] for examples of apps packaged with `pkgr` (Gitlab, OpenProject, Discourse, etc.).
 
 ## Installation
 
@@ -54,11 +60,11 @@ Or, installing as a gem, on debian-based machines:
 
 ## Usage
 
-To package your app, you can either execute `pkgr` locally if your app repository is on the same machine:
+To package your app, execute `pkgr` against your app's repository:
 
     pkgr package path/to/app/repo
 
-The resulting .deb package will be in your current working directory.
+The resulting `.deb` or `.rpm` package will be in your current working directory. That is, you need to run `pkgr` on the target distribution for which you want to generate a package.
 
 Full command line options are given below:
 
@@ -75,7 +81,8 @@ Full command line options are given below:
       [--architecture=ARCHITECTURE]                  # Target architecture for the package
                                                      # Default: x86_64
       [--runner=RUNNER]                              # Force a specific runner (e.g. upstart-1.5, sysv-lsb-1.3)
-      [--homepage=HOMEPAGE]                          # Project homepage
+      [--homepage=HOMEPAGE]                          # Project homepage (e.g. "https://pkgr.example.org")
+      [--home=HOME]                                  # Project home (e.g. "/usr/share/PACKAGE_HOME")
       [--description=DESCRIPTION]                    # Project description
       [--category=CATEGORY]                          # Category this package belongs to
                                                      # Default: none
@@ -147,11 +154,13 @@ Finally, it's a great way to share your open source software with your users and
 
 * Your app will reside in `/opt/app-name`.
 
-* You'll also get upstart (or sysvinit) initialization scripts that you can use directly:
+* You'll also get upstart, systemd, or sysvinit initialization scripts (depending on your distribution) that you can use directly:
 
         service my-app start/stop/restart/status
 
-* Logs will be stored in `/var/log/app-name/`, with a proper logrotate config automatically added.
+  Note: init scripts are generated only after you've done a `scale` command for the process type, e.g. `my-app scale web=1`.
+
+* Logs will be stored in `/var/log/app-name/`, with a proper logrotate config automatically added. For systemd-based distributions, you will find the logs in the systemd journal.
 
 * Config files can be added in `/etc/app-name/`
 
@@ -189,3 +198,5 @@ Issue getting nokogiri to compile? Try the following based on this [comment](htt
 ## Copyright
 
 See LICENSE (MIT)
+
+

data/data/build_dependencies/debian.yml

@@ -1,15 +1,25 @@
 default:
   - curl
-  - libmysqlclient-dev
   - libpq-dev
   - libsqlite3-0
   - libevent-dev
-  - libssl-dev
   - libxml2-dev
   - libxslt1-dev
   - libreadline-dev
   - build-essential
 debian-6:
   - libssl0.9.8
+  - libssl-dev
+  - libmysqlclient-dev
 debian-7:
   - libssl1.0.0
+  - libssl-dev
+  - libmysqlclient-dev
+debian-8:
+  - libssl1.0.0
+  - libssl-dev
+  - libmysqlclient-dev
+debian-9:
+  - libssl1.0.2
+  - libssl1.0-dev
+  - default-libmysqlclient-dev

data/data/buildpacks/amazon-2014

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/amazon-2015

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/centos-6

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/centos-7

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-6

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-ruby.git,CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300

data/data/buildpacks/debian-7

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-8

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-9

@@ -0,0 +1,4 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
+https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/fedora-20

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106

data/data/buildpacks/sles-11

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106

data/data/buildpacks/sles-12

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106

data/data/buildpacks/ubuntu-10.04

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git

data/data/buildpacks/ubuntu-12.04

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/ubuntu-14.04

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/ubuntu-16.04

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#buildcurl,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
-https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/cli/cli.sh.erb

@@ -12,6 +12,10 @@ export ORIGINAL_PWD=$(pwd)
 # required for chroot on fedora
 PATH="$PATH:/usr/sbin"
 
+if [ -n "$PORT" ]; then
+  BASE_PORT=$PORT
+fi
+
 # Helper function that returns the real path, based on the given ROOT_PATH
 _p() {
   echo "${ROOT_PATH%%/}${1}"
@@ -26,6 +30,22 @@ usage() {
   echo "  $APP_NAME config:set VAR=VALUE"
   echo "  $APP_NAME configure"
   echo "  $APP_NAME reconfigure"
+  echo "  $APP_NAME restart"
+  echo ""
+  echo "Details:"
+  echo "  $APP_NAME configure [-f FILE|-]"
+  echo "    * If using an installer:"
+  echo "      This command will launch the installer wizard."
+  echo "      You can pass the installer seed file as argument or on STDIN."
+  echo "   * Without installer:"
+  echo "      This will execute the configure script at $APP_HOME/packaging/scripts/configure (if any)."
+  echo "      A file containing environment variables can be given as argument or on STDIN (-f -), and will be saved in the /etc/$APP_NAME/conf.d folder."
+  echo ""
+  echo "  $APP_NAME reconfigure"
+  echo "    This command allows to reconfigure the application. Only useful if using an installer."
+  echo ""
+  echo "  $APP_NAME restart [process]"
+  echo "    This will restart the application (or the given process), in a distribution-independent manner."
 }
 
 DEFAULT_FILE=$(_p "/etc/default/${APP_NAME}")
@@ -50,11 +70,18 @@ fi
 
 # Source all environment variables for the app. This must be done as
 # privileged user since the config variables are only readable by root.
-PORT_WAS=$PORT
 for file in $(_p "/etc/${APP_NAME}/conf.d")/*; do
   if [ -f $file ]; then . $file; fi
 done
 
+if [ -z "$BASE_PORT" ]; then
+  BASE_PORT=$PORT
+fi
+
+if [ -z "$BASE_PORT" ]; then
+  BASE_PORT=6000
+fi
+
 # Some actions require root privileges
 ensure_root() {
   if [ $(id -u) -ne 0 ]; then
@@ -69,20 +96,44 @@ show_env() {
   env -i ROOT_PATH=${ROOT_PATH} ${0} run env | sort
 }
 
-logs() {
-  if [ "$1" = "" ]; then
+logs_opt() {
+  if [ "$1" == "" ]; then
     for file in $(_p "/var/log/${APP_NAME}")/*.log ; do
       echo "==> ${file} <=="
       cat "${file}"
     done
   else
-    tail $(_p "/var/log/${APP_NAME}")/*.log $@
+    tail $(_p "/var/log/${APP_NAME}")/*.log "$@"
   fi
 }
+logs_systemd() {
+  journalctl -u "$APP_NAME-*" -e "$@"
+}
 
-tail_logs() {
+logs() {
+  if [ "${APP_RUNNER_TYPE}" == "systemd" ]; then
+    # combine output of both opt and systemd logs
+    # no options given to log_opt since we want to use newer options of journalctl
+    { logs_opt & logs_systemd "$@" ; }
+  else
+    logs_opt "$@"
+  fi
+}
+
+tail_logs_opt() {
   tail -f $(_p "/var/log/${APP_NAME}")/*.log
 }
+tail_logs_systemd() {
+  journalctl -u "$APP_NAME-*" -f "$@"
+}
+tail_logs() {
+  if [ "${APP_RUNNER_TYPE}" == "systemd" ]; then
+    # combine output of both opt and systemd logs
+    { tail_logs_opt & tail_logs_systemd "$@" ; }
+  else
+    tail_logs_opt
+  fi
+}
 
 current_number_of_processes() {
   PROCESS_NAME="$1"
@@ -97,19 +148,47 @@ current_number_of_processes() {
   return 0
 }
 
-update_port() {
-  file="$1"
-  process_name="$2"
-  port="$3"
-  index="$4"
-
-  sed -i "s/PROCESS_NUM/${index}/g" "${file}"
-  if [ "${process_name}" = "web" ]; then
-    sed -i "s/PORT_NUM/${port}/g" "${file}"
+# Return the process index in the Procfile, ignoring any comment lines.
+process_index() {
+  process_name="$1"
+  if [ -f "$(_p "${APP_HOME}/Procfile")" ]; then
+    index="$(cat "$(_p "${APP_HOME}/Procfile")" | grep -ve '^#' | grep -n "$process_name:" | cut -f 1 -d ':')"
   else
-    sed -i "s/^env .*PORT_NUM.*$//g" "${file}"
-    sed -i "s/^export PORT=PORT_NUM$//g" "${file}"
+    index=0
   fi
+  echo $(($index - 1))
+}
+
+# Returns whether a custom PORT has been set for this process.
+is_custom_port() {
+  test "$PORT" != "$BASE_PORT"
+}
+
+# Returns the port to be used by the process.
+process_port() {
+  local process_name="$1"
+  local process_scale_index="$2"
+  if [ "$process_scale_index" == "" ]; then
+    process_scale_index=1
+  fi
+  if is_custom_port; then
+    # legacy: port was set in init files, not touching
+    echo "$BASE_PORT"
+  else
+    local process_offset=$(process_index "$process_name")
+    local port_with_offset=$(($PORT + $process_offset * 100 + $process_scale_index - 1))
+    echo "$port_with_offset"
+  fi
+}
+
+# Writes the process index in the init file, so that the right PORT can be set
+# when running the process.
+update_port() {
+  local file="$1"
+  local process_name="$2"
+  local index="$3"
+  local port_with_offset=$(process_port "$process_name" "$index")
+  sed -i "s/__PROCESS_INDEX__/${index}/g" "${file}"
 }
 
 sysv_enable() {
@@ -147,68 +226,66 @@ scale_up() {
       index=$((${i} + ${CURRENT_SCALE}))
       PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
       cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}-${PROCESS_NAME}-PROCESS_NUM.conf") $(_p "/etc/init/${PROCESS_ID}.conf")
-      port=$((${PORT} + ${index} - 1))
 
-      update_port $(_p "/etc/init/${PROCESS_ID}.conf") "${PROCESS_NAME}" $port $index
+      update_port $(_p "/etc/init/${PROCESS_ID}.conf") "${PROCESS_NAME}" $index
 
       # directly call initctl instead of service, otherwise CentOS 6.x does not understand.
-      $APP_RUNNER_CLI start "${PROCESS_ID}"
+      control_process start "${PROCESS_NAME}-${index}"
     done
 
-    $APP_RUNNER_CLI start ${APP_NAME}-${PROCESS_NAME} || true
-    $APP_RUNNER_CLI start ${APP_NAME} || true
+    control_process start "${PROCESS_NAME}" || true
+    control_process start || true
   elif [ "$APP_RUNNER_TYPE" = "systemd" ]; then
     for i in $(seq ${SCALE_DELTA}); do
       index=$((${i} + ${CURRENT_SCALE}))
       PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
       cp ${source}/${APP_NAME}-${PROCESS_NAME}-PROCESS_NUM.service $SYSTEMD_DIR/${PROCESS_ID}.service
-      port=$((${PORT} + ${index} - 1))
 
-      update_port $SYSTEMD_DIR/${PROCESS_ID}.service "${PROCESS_NAME}" $port $index
+      update_port $SYSTEMD_DIR/${PROCESS_ID}.service "${PROCESS_NAME}" $index
 
       $APP_RUNNER_CLI enable "${PROCESS_ID}.service"
     done
 
     $APP_RUNNER_CLI daemon-reload
-    $APP_RUNNER_CLI start ${APP_NAME}-${PROCESS_NAME}.service
-    $APP_RUNNER_CLI start ${APP_NAME}.service
+    control_process start "${PROCESS_NAME}"
+    control_process start
   else
     for i in $(seq ${SCALE_DELTA}); do
       index=$((${i} + ${CURRENT_SCALE}))
       PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
       cp $(_p "${APP_HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}-${PROCESS_NAME}-PROCESS_NUM") $(_p "/etc/init.d/${PROCESS_ID}")
-      port=$((${PORT} + ${index} - 1))
 
-      update_port $(_p "/etc/init.d/${PROCESS_ID}") "${PROCESS_NAME}" $port $index
+      update_port $(_p "/etc/init.d/${PROCESS_ID}") "${PROCESS_NAME}" $index
 
       chmod a+x $(_p "/etc/init.d/${PROCESS_ID}")
-      sysv_enable ${PROCESS_ID}
-      $(_p "/etc/init.d/${PROCESS_ID}") start
+      sysv_enable "${PROCESS_ID}"
+      control_process start "${PROCESS_NAME}-${index}"
     done
   fi
   echo "--> done."
 }
 
 scale_down() {
-  PROCESS_NAME="${1}"
-  CURRENT_SCALE=${2}
-  NEW_SCALE=${3}
-  SCALE_DELTA=${4}
+  local PROCESS_NAME="${1}"
+  local CURRENT_SCALE=${2}
+  local NEW_SCALE=${3}
+  local SCALE_DELTA=${4}
+  local index
+  local PROCESS_ID
 
   echo "Scaling down..."
   for i in $(seq $(($SCALE_DELTA * -1))); do
     index=$((${i} + ${NEW_SCALE}))
     PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
 
+    control_process stop "${PROCESS_NAME}-${index}" || true # dont fail if server stopped differently
+
     if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
-      $APP_RUNNER_CLI stop "${PROCESS_ID}" || true # dont fail if server stopped differently
       rm -f $(_p "/etc/init/${PROCESS_ID}.conf")
     elif [ "${APP_RUNNER_TYPE}" = "systemd" ]; then
-      $APP_RUNNER_CLI stop "${PROCESS_ID}.service" || true # dont fail if server stopped differently
       $APP_RUNNER_CLI disable "${PROCESS_ID}.service" || true
       rm -f $SYSTEMD_DIR/${PROCESS_ID}.service
     else
-      $(_p "/etc/init.d/${PROCESS_ID}") stop
       sysv_disable ${PROCESS_ID}
       rm -f $(_p "/etc/init.d/${PROCESS_ID}")
     fi
@@ -262,10 +339,27 @@ scale() {
 
 configure() {
   local installer_dir="$(_p "/usr/share/${APP_NAME}/installer")"
+  local configure_script="$(_p "$APP_HOME/packaging/scripts/configure")"
+  local file=""
+  if [ "$1" == "-f" ]; then
+    file="$2"
+    shift 2
+  fi
+
   if [ -d "$installer_dir" ] ; then
-    ${installer_dir}/bin/run $@
+    if [ "$file" != "" ]; then
+      cat "$file" > $(_p "/etc/$APP_NAME/installer.dat")
+    fi
+    exec ${installer_dir}/bin/run "$@"
   else
-    echo "No installer has been configured for ${APP_NAME}"
+    if [ "$file" != "" ]; then
+      cat "$file" | grep -v '^#' | while read -r line ; do
+        config_set "$line"
+      done
+    fi
+    if [ -f "$configure_script" -a -x "$configure_script" ] ; then
+      exec $0 run "$configure_script" "$@"
+    fi
   fi
 }
 
@@ -273,6 +367,36 @@ reconfigure() {
   configure --reconfigure
 }
 
+config_set() {
+  # http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02
+  local key="${1%%=*}"
+  local value="${1#*=}"
+  local file=$(_p "/etc/${APP_NAME}/conf.d/other")
+  touch "$file"
+  sed -i -r "s/^\s*export\s+${key}.*$//g" $(_p "/etc/${APP_NAME}/conf.d")/*
+  echo "export ${key}=\"${value}\"" >> "${file}"
+  sed -i '/^\s*$/d' "$file"
+}
+
+# Executes the given command (start, stop, restart, status, etc.) on the given
+# process, abstracting away the differences between init systems.
+control_process() {
+  local cmd="$1"
+  local process="$2"
+  local service="$APP_NAME"
+  if [ "$process" != "" ]; then
+    service="$service-$process"
+  fi
+
+  if [ "${APP_RUNNER_TYPE}" == "upstart" ]; then
+    $APP_RUNNER_CLI "$cmd" "${service}"
+  elif [ "$APP_RUNNER_TYPE" = "systemd" ]; then
+    $APP_RUNNER_CLI "$cmd" "${service}.service"
+  else
+    $(_p "/etc/init.d/${service}") "$cmd"
+  fi
+}
+
 while : ; do
   case "$1" in
     run)
@@ -283,6 +407,7 @@ while : ; do
       runnable=$(echo -n "exec")
 
       if [ -f $(_p "${APP_HOME}/vendor/pkgr/processes/${COMMAND}") ]; then
+        export PORT=$(process_port "$COMMAND" "$APP_PROCESS_INDEX")
         # Command alias defined in Procfile
         runnable="${runnable}$(printf " %q" $(_p "${APP_HOME}/vendor/pkgr/processes/${COMMAND}") "$@")"
       else
@@ -294,9 +419,6 @@ while : ; do
         runnable="${runnable}$(printf " %q" ${COMMAND} "$@")"
       fi
 
-      # fix port
-      export PORT=$PORT_WAS
-
       # Do not use su, to avoid creating a new process. Note: chroot version
       # is too old on Ubuntu Lucid, so this will fail. It works on Debian
       # Squeeze though (and later).
@@ -325,12 +447,18 @@ while : ; do
       done
       break ;;
 
+    restart)
+      shift
+      control_process "restart" "$@"
+      break;;
+
     logs)
       shift
-      if [ "$1" = "--tail" ]; then
+      if [ "$1" == "--tail" -o "$1" == "-f" ]; then
+        shift
         tail_logs
       else
-        logs ${@}
+        logs "${@}"
       fi
       break;;
 
@@ -340,18 +468,7 @@ while : ; do
 
     config:set)
       [ $# -lt 2 ] && usage
-
-      CONFIG=(${2//=/ })
-
-      VAR=${CONFIG[0]:?"Invalid variable name"}
-      VALUE="${2:$((${#VAR} + 1))}"
-
-      CONFIG_FILE=$(_p "/etc/${APP_NAME}/conf.d/other")
-      touch ${CONFIG_FILE}
-
-      sed -i -r "s/^\s*export\s+${VAR}.*$//g" $(_p "/etc/${APP_NAME}/conf.d")/*
-
-      echo "export ${VAR}=\"${VALUE}\"" >> "${CONFIG_FILE}"
+      config_set "$2"
 
       break;;
 
@@ -362,14 +479,16 @@ while : ; do
 
     configure)
       ensure_root
+      shift
 
-      configure $@
+      configure "$@"
       break;;
 
     reconfigure)
       ensure_root
+      shift
 
-      reconfigure $@
+      reconfigure "$@"
       break;;
 
     *)