propro 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6717883ed5d6aa6b1b84699959f6a9a29df5e4
-  data.tar.gz: 23b26e30d0cce9ecc404a814cb9f7d1c6c6eb5c1
+  metadata.gz: 5c502589f40be1481a47fcfe531c1cb52cabd254
+  data.tar.gz: 471c29f3c8dd302cfd62fe46de730b86f52dce1f
 SHA512:
-  metadata.gz: d38596eeb7ea5bad0ad17c07a5ee48fced95cf269e145175f719c144ec40581bef0edf4901bce6973ad39e914121ec86884cd3ca9142572412cccac56b9fd4b1
-  data.tar.gz: 138ec684c4b04153eb2ef9783596de1bef9dc8af685961ddec3ad803b7effb9ba6b48e202d5aa82c4ab4d3454b1e622f04712f7da9fdc140e40ce3993299de7f
+  metadata.gz: 1bbaf3c00f4dfc501af427bddc3f4c4357995c86549eed9f3a5c0ca5173ad01201d6689b49e9f3735b8cbb20d109d6b131fcfb60e098094c0ff7f4230d4211a5
+  data.tar.gz: 835a703fe482208a1be310fcc632c3b61c443f73732ce1dbe28c00e9a0f6f0ae4ffa7c7fa0b2f3ed7a4761d32a3fa191916f1a6dcee003664392c1de02bca029

data/ext/bash/app/rvm.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # requires app.sh
-export APP_RVM_RUBY_VERSION="2.0.0" # @specify
+export APP_RVM_RUBY_VERSION="2.1.1" # @specify
 
 function provision-app-rvm {
   rvm-install-for-user $APP_USER $APP_RVM_RUBY_VERSION

data/ext/bash/app/sidekiq.sh

@@ -17,8 +17,8 @@ stop on runlevel [06]
 env APP_SIDEKIQ_CONF="$APP_SIDEKIQ_CONF_FILE"
 
 pre-start script
-  for i in `cat \$APP_SIDEKIQ_CONF`; do
-    app=`echo \$i | cut -d , -f 1`
+  for i in \`cat \$APP_SIDEKIQ_CONF_FILE\`; do
+    app=\`echo \$i | cut -d , -f 1\`
     logger -t "sidekiq-manager" "Starting \$app"
     start sidekiq app=\$app
   done
@@ -41,7 +41,7 @@ exec /bin/bash <<EOTT
   source \$HOME/.rvm/scripts/rvm
   logger -t sidekiq "Starting worker: \$app"
   cd \$app
-  exec bundle exec sidekiq -C $APP_SIDEKIQ_CONFIG_FILE_RELATIVE -P $APP_SIDEKIQ_PID_FILE_RELATIVE
+  exec bundle exec sidekiq -e $APP_ENV -C $APP_SIDEKIQ_CONFIG_FILE_RELATIVE -P $APP_SIDEKIQ_PID_FILE_RELATIVE
 EOTT
 end script
 

data/ext/bash/app.sh

@@ -27,8 +27,8 @@ function get-app-shared-sockets-dir {
   echo "$(get-app-shared-dir)/sockets"
 }
 
-function get-app-config-dir {
-  echo "$(get-app-dir)/config"
+function get-app-shared-config-dir {
+  echo "$(get-app-shared-dir)/config"
 }
 
 function get-app-current-dir {
@@ -75,7 +75,7 @@ function app-create-dirs {
   app-mkdir "$APPS_DIR"
   app-mkdir "$(get-app-dir)"
   app-mkdir "$(get-app-releases-dir)"
-  app-mkdir "$(get-app-config-dir)"
+  app-mkdir "$(get-app-shared-config-dir)"
   app-mkdir "$(get-app-shared-dir)"
   app-mkdir "$(get-app-shared-tmp-dir)"
   app-mkdir "$(get-app-shared-log-dir)"

data/ext/bash/lib/ffmpeg.sh

@@ -7,9 +7,17 @@ export FFMPEG_VERSION="git" # @specify (or a version to download: "2.1.4")
 export FFMPEG_YASM_VERSION="1.2.0"
 export FFMPEG_XVID_VERSION="1.3.2"
 
-FFMPEG_URL="http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.gz"
-FFMPEG_YASM_URL="http://www.tortall.net/projects/yasm/releases/yasm-$FFMPEG_YASM_VERSION.tar.gz"
-FFMPEG_XVID_URL="http://downloads.xvid.org/downloads/xvidcore-$FFMPEG_XVID_VERSION.tar.gz"
+function get-ffmpeg-url {
+  echo "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.gz"
+}
+
+function get-ffmpeg-yasm-url {
+  echo "http://www.tortall.net/projects/yasm/releases/yasm-$FFMPEG_YASM_VERSION.tar.gz"
+}
+
+function get-ffmpeg-xvid-url {
+  echo "http://downloads.xvid.org/downloads/xvidcore-$FFMPEG_XVID_VERSION.tar.gz"
+}
 
 function ffmpeg-install {
   local tmpdir=$(get-tmp-dir)
@@ -23,7 +31,7 @@ function ffmpeg-install {
 
   announce-item "Yasm"
   announce-item "> Download"
-  download $FFMPEG_YASM_URL
+  download $(get-ffmpeg-yasm-url)
 
   announce-item "> Extract"
   extract yasm-$FFMPEG_YASM_VERSION.tar.gz
@@ -58,7 +66,7 @@ function ffmpeg-install {
 
   announce-item "Xvid"
   announce-item "> Download"
-  download $FFMPEG_XVID_URL
+  download $(get-ffmpeg-xvid-url)
 
   announce-item "> Extract"
   extract xvidcore-$FFMPEG_XVID_VERSION.tar.gz
@@ -79,7 +87,7 @@ function ffmpeg-install {
     git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git
     cd ffmpeg
   else
-    download $FFMPEG_URL
+    download $(get-ffmpeg-url)
 
     announce "Extract"
     extract ffmpeg-$FFMPEG_VERSION.tar.gz

data/ext/bash/lib/nginx.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-export NGINX_VERSION="1.4.7" # @specify
+export NGINX_VERSION="1.6.0" # @specify
 export NGINX_USER="nginx"
 export NGINX_CONFIGURE_OPTS="--with-http_ssl_module --with-http_gzip_static_module" # @specify
 export NGINX_CONF_FILE="/etc/nginx.conf"
@@ -17,6 +17,10 @@ export NGINX_WORKER_CONNECTIONS="2000" # @specify
 NGINX_SITES_DIR="$NGINX_ETC_DIR/sites"
 NGINX_CONF_DIR="$NGINX_ETC_DIR/conf"
 
+function get-nginx-url {
+  echo "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
+}
+
 function nginx-install {
   local tmpdir=$(get-tmp-dir)
   cd "$tmpdir"
@@ -24,7 +28,7 @@ function nginx-install {
   install-packages $NGINX_DEPENDENCIES
 
   announce "Download $NGINX_VERSION"
-  download http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz
+  download $(get-nginx-url)
 
   announce "Extract"
   extract nginx-$NGINX_VERSION.tar.gz

data/ext/bash/lib/pg.sh

@@ -4,9 +4,12 @@ export PG_EXTENSIONS="btree_gin btree_gist fuzzystrmatch hstore intarray ltree p
 export PG_CONFIG_FILE="/etc/postgresql/$PG_VERSION/main/postgresql.conf"
 export PG_HBA_FILE="/etc/postgresql/$PG_VERSION/main/pg_hba.conf"
 export PG_TUNE_VERSION="0.9.3"
-export PG_TUNE_URL="http://pgfoundry.org/frs/download.php/2449/pgtune-$PG_TUNE_VERSION.tar.gz"
 export PG_USER="postgres"
 
+function get-pg-tune-url {
+  echo "http://pgfoundry.org/frs/download.php/2449/pgtune-$PG_TUNE_VERSION.tar.gz"
+}
+
 function pg-install-packages {
   install-packages postgresql-$PG_VERSION libpq-dev postgresql-contrib-$PG_VERSION
 }
@@ -16,7 +19,7 @@ function pg-tune {
   cd "$tmpdir"
 
   announce "Tune PostgreSQL $PG_VERSION"
-  download $PG_TUNE_URL
+  download $(get-pg-tune-url)
   extract pgtune-$PG_TUNE_VERSION.tar.gz
 
   ./pgtune-$PG_TUNE_VERSION/pgtune -i $PG_CONFIG_FILE -o $PG_CONFIG_FILE.pgtune

data/ext/bash/lib/redis.sh

@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
-export REDIS_VERSION="2.8.7" # @specify
+export REDIS_VERSION="2.8.9" # @specify
 export REDIS_USER="redis"
 export REDIS_CONF_FILE="/etc/redis.conf"
 export REDIS_DATA_DIR="/var/lib/redis"
 export REDIS_FORCE_64BIT="no" # @specify Force 64bit build even if available memory is lte 4GiB
-REDIS_URL="http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz"
+
+function get-redis-url {
+  echo "http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz"
+}
 
 function redis-install {
   local tmpdir=$(get-tmp-dir)
   cd "$tmpdir"
 
   announce "Download $REDIS_VERSION"
-  download $REDIS_URL
+  download $(get-redis-url)
 
   announce "Extract"
   extract redis-$REDIS_VERSION.tar.gz

data/ext/bash/lib/ubuntu.sh

@@ -39,14 +39,16 @@ function add-repository {
 function add-sudoers-entries {
   for event in start status stop reload restart; do
     if [ $3 ]; then
-      tee -a /etc/sudoers.d/$2.entries <<EOT
+      tee -a /etc/sudoers.d/$2-entries <<EOT
 $1 ALL=NOPASSWD: /sbin/$event $2 $3
 EOT
     else
-      tee -a /etc/sudoers.d/$2.entries <<EOT
+      tee -a /etc/sudoers.d/$2-entries <<EOT
 $1 ALL=NOPASSWD: /sbin/$event $2
 EOT
     fi
+
+    chmod 0440 /etc/sudoers.d/$2-entries
   done
 }
 

data/ext/bash/vps/system.sh

@@ -9,7 +9,7 @@ export VPS_SYSTEM_ADMIN_USER="admin" # @specify
 export VPS_SYSTEM_PRIVATE_NETMASK="255.255.128.0" # @specify Default is for Linode, DigitalOcean: 255.255.0.0
 export VPS_SYSTEM_PUBLIC_NETMASK="255.255.255.0" # @specify Default is for Linode, DigitalOcean: 255.255.240.0
 export VPS_SYSTEM_ALLOW_PORTS="www 443 ssh"
-export VPS_SYSTEM_LIMIT_PORTS="ssh"
+export VPS_SYSTEM_LIMIT_PORTS="ssh" # @specify Default will limit connection attempts from the same IP on SSH, this can cause problems with certain deployment techniques.
 export VPS_SYSTEM_ALLOW_PRIVATE_IPS="" # @specify
 export VPS_SYSTEM_ALLOW_PRIVATE_PORTS="5432 6379" # Postgres & Redis
 export VPS_SYSTEM_GET_PUBLIC_IP_SERVICE_URL="http://ipecho.net/plain"

data/lib/propro/version.rb

@@ -1,3 +1,3 @@
 module Propro
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propro
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Carsten Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor