propro 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b07fd0c57004c103d92f1432d332576d42a2c727
-  data.tar.gz: 224de6f4c0082f49bbe4439e6b29fe689ecc9ea0
+  metadata.gz: f931ac11df6b50792a31bdcc3a5647d13e9f4506
+  data.tar.gz: fbbaee3496ec6f96e56e52b20d2c0ad2b5a7935b
 SHA512:
-  metadata.gz: e2916678fdd03b6f0f1f39316adaea8199dd397d7e798cf95d24b6e2e01988b72beb38f59cf8ff4afd44b0d5624b31f00e8a34c93f34df5d5aaec3c71372abcc
-  data.tar.gz: f28f60a839ff498107eb3c26b400bcfd4f1deedd95a28a892dae87a9c430ebd52b454a03d3c510a3e6af8acef544c0c664d87a4eb33e64efc03c93e0ab076204
+  metadata.gz: 815249fbbf1e5cbccc9ca6894628a8a94c8695c0f930b1f1082381864b8d7aca1f6dbacf275f28f9bcc49da7b0ff5bd8b42f0b06f037498d7167f9dfd8b57db3
+  data.tar.gz: 90fbf023c021736649cc126453339e8b39c00530423b89ef593b2f83a219fc45bb0c8cef90aad05bd0f41a1c6f89e645de4df26a677a8e0c2f714d1ca60ee80e

data/examples/vagrant.propro

@@ -1,4 +1,4 @@
-#     ____  _________  ____  _________
+s#     ____  _________  ____  _________
 #    / __ \/ ___/ __ \/ __ \/ ___/ __ \
 #   / /_/ / /  / /_/ / /_/ / /  / /_/ /
 #  / .___/_/   \____/ .___/_/   \____/
@@ -9,27 +9,34 @@
 
 source :vagrant
 
+# Tune shared memory
 set :system_shmall_percent, 0.65
 set :system_shmmax_percent, 0.35
 provision 'vagrant/system'
 
+# Install PG
 set :pg_version, 9.3
 provision 'vagrant/pg'
 
+# Install Redis
 set :redis_version, '2.8.4'
 provision 'vagrant/redis'
 
+# Install Ruby via RVM
 set :vagrant_rvm_ruby_version, '2.0.0'
 provision 'vagrant/rvm'
 
+# Install Nginx
 set :nginx_version,              '1.4.4'
 set :nginx_worker_connections,   100
 set :nginx_client_max_body_size, '100m'
 provision 'vagrant/nginx'
 
+# Install Node
 set :node_version, '0.10.25'
 provision 'vagrant/node'
 
+# Install extra packages
 set :extra_packages, [
   'man',              # RTFM!
   'git-core',         # For Bundler

data/examples/webserver.propro

@@ -0,0 +1,126 @@
+# This is an example Propro file that will build a standalone web server on
+# DigitalOcean or Linode
+#
+# To use it, here are the steps you'd take:
+#
+# 0. Read this file and modify it accordingly
+# 1. Create a new Droplet / Linode and specify Ubuntu 12.04 LTS (32 or 64 bit)
+# 2. From your command line run:
+#    $ propro deploy path/to/webserver.propro --server {{PUBLIC_IP_ADDRESS}}
+# 3. Enter the root password you were provided
+# 4. Watch Propro do it's thing, when it's done, wait for your machine to reboot
+# 5. ssh admin@{{PUBLIC_IP_ADDRESS}}
+# 6. Boom.
+#
+# Check out the ext/bash directory to see the avaliable config options, the
+# option names map over to the directory tree, for example, to find where
+# `vps_system_admin_authorized_github_users` is defined, check out:
+# `ext/bash/vps/system.sh`
+
+# Let Propro know about the packages you'd like to load:
+source :vps
+source :app
+source :db
+
+# The machine's name
+set :vps_system_hostname, 'web1'
+
+# Fully Qualified Domain Name for the server, usually: hostname.domain
+set :vps_system_fqdn, 'web1.myapp.com'
+
+# Propro will install the public keys of these GitHub users for the admin user
+# they will be able to ssh into the machine once it's provisioned without a
+# password.
+set :vps_system_admin_authorized_github_users, ['??????', '????????']
+
+# When you ssh into the machine as the admin user, this is the password you
+# will type for sudo:
+set :vps_system_admin_sudo_password, '?????????'
+
+# For DigitalOcean this info can be found in the Settings tab of your Droplet,
+# the default value is for Linode so you can remove this line in that case.
+set :vps_system_public_netmask, '255.255.240.0'
+
+# You don't need to assign a private IP to your VPS, you can remove the
+# following lines if you don't care to use a private IP but it's a really good
+# idea to assign one.
+set :vps_system_private_ip, '10.???.???.???'
+set :vps_system_private_netmask, '255.255.0.0'
+
+# Shared memory configuration preferences, the defaults are for a database
+# server, if you host your database on the same machine as the webserver, it
+# might make sense to tweak these
+set :system_shmall_percent, 0.75
+set :system_shmmax_percent, 0.5
+
+# Let Propro know that you would like to run the vps/system provisioner this
+# will set up a base system, disable root login and create an admin user that
+# the above GitHub users will be able to ssh into.
+provision 'vps/system'
+
+# This is the PG version you'd like to use, any of the versions listed on
+# apt.postgresql.org can be specified.
+set :pg_version, 9.3
+
+# List the extension's you'd like to enable, the defaults are listed below, if
+# you're cool with the defaults, you can delete the line.
+set :pg_extensions, [
+  'btree_gin',
+  'btree_gist',
+  'fuzzystrmatch',
+  'hstore',
+  'intarray',
+  'ltree',
+  'pg_trgm',
+  'tsearch2',
+  'unaccent'
+] # see: http://www.postgresql.org/docs/9.3/static/contrib.html
+
+# This is the name of the database that will be created:
+set :db_pg_name, 'myapp'
+
+# This is the name of the DB user to create:
+set :db_pg_user, 'deploy'
+
+# Run the DB provisioner, this will install PG and create the database for the
+# specified user, if the username is the same as the deploy user you don't
+# need to specify it when you connect to the database:
+provision 'db/pg'
+
+# The domain of the web application that you will be deploying.
+set :app_domain, 'myapp.com'
+
+# Propro will install the public keys of these GitHub users for the deploy user
+# they will be able to ssh into the machine without a password as the deploy
+# user once it's provisioned and will be able to deploy the application.
+set :app_authorized_github_users, ['??????', '??????']
+
+# The name of the deploy user, the app will run as this user:
+set :app_user, 'deploy'
+
+# The base directory to put the application files and data into:
+set :apps_dir, '/sites'
+
+# Run the app provisioner
+provision 'app'
+
+# Specify the Nginx version to compile from source:
+set :nginx_version, '1.4.7'
+
+# Install Nginx and base conf files. All confs are put into
+# /etc/{{service}}.conf
+provision 'app/nginx'
+
+# Specify the version of Node to install
+set :node_version, '0.10.26'
+provision 'app/node'
+
+# Install Ruby 2.0 via RVM
+set :app_rvm_ruby_version, '2.0.0'
+provision 'app/rvm'
+
+# Install Puma service
+provision 'app/puma'
+
+# Install Puma configuration for Nginx
+provision 'app/puma/nginx'

data/ext/bash/app/ffmpeg.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+function provision-app-ffmpeg {
+  section "FFmpeg"
+  ffmpeg-install
+}

data/ext/bash/lib/ffmpeg.sh

@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+# http://askubuntu.com/a/148567
+# https://trac.ffmpeg.org/wiki/UbuntuCompilationGuide
+# http://juliensimon.blogspot.ca/2013/08/howto-compiling-ffmpeg-x264-mp3-aac.html
+
+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 ffmpeg-install {
+  local tmpdir=$(get-tmp-dir)
+  cd "$tmpdir"
+
+  announce "Install Dependencies"
+  install-packages build-essential git libfaac-dev libgpac-dev \
+    libjack-jackd2-dev libmp3lame-dev libopencore-amrnb-dev \
+    libopencore-amrwb-dev libsdl1.2-dev libtheora-dev libva-dev libvdpau-dev \
+    libvorbis-dev libxfixes-dev zlib1g-dev libgsm1-dev
+
+  announce-item "Yasm"
+  announce-item "> Download"
+  download $FFMPEG_YASM_URL
+
+  announce-item "> Extract"
+  extract yasm-$FFMPEG_YASM_VERSION.tar.gz
+  cd yasm-$FFMPEG_YASM_VERSION
+
+  announce-item "> Configure"
+  ./configure
+
+  announce-item "> Compile"
+  make
+
+  announce-item "> Install"
+  make install
+  make distclean
+  cd ..
+
+  announce-item "X264"
+  announce-item "> Download"
+  git clone --depth 1 git://git.videolan.org/x264
+
+  announce-item "> Configure"
+  cd x264
+  ./configure --prefix=/usr/local --enable-shared
+
+  announce-item "> Compile"
+  make
+
+  announce-item "> Install"
+  make install
+  make distclean
+  cd ..
+
+  announce-item "Xvid"
+  announce-item "> Download"
+  download $FFMPEG_XVID_URL
+
+  announce-item "> Extract"
+  extract xvidcore-$FFMPEG_XVID_VERSION.tar.gz
+  cd xvidcore/build/generic
+
+  announce-item "> Configure"
+  ./configure --prefix=/usr/local
+
+  announce-item "> Compile"
+  make
+
+  announce-item "> Install"
+  make install
+  cd ../../..
+
+  announce "Download $FFMPEG_VERSION"
+  if [ $FFMPEG_VERSION == "git" ]; then
+    git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git
+    cd ffmpeg
+  else
+    download $FFMPEG_URL
+
+    announce "Extract"
+    extract ffmpeg-$FFMPEG_VERSION.tar.gz
+    cd ffmpeg-$FFMPEG_VERSION
+  fi
+
+  announce "Configure"
+  ./configure --prefix=/usr/local --enable-gpl --enable-version3 \
+    --enable-nonfree --enable-shared --enable-libopencore-amrnb \
+    --enable-libopencore-amrwb --enable-libfaac --enable-libgsm \
+    --enable-libmp3lame --enable-libtheora --enable-libvorbis \
+    --enable-libx264 --enable-libxvid
+
+  announce "Compile"
+  make
+
+  announce "Install"
+  make install
+  make distclean
+  ldconfig -v
+
+  cd ~/
+  rm -rf "$tmpdir"
+}

data/ext/bash/lib/nginx.sh

@@ -9,6 +9,7 @@ export NGINX_ACCESS_LOG_FILE_NAME="access.log"
 export NGINX_ERROR_LOG_FILE_NAME="error.log"
 export NGINX_DEPENDENCIES="libpcre3-dev libssl-dev"
 export NGINX_WORKER_COUNT=$(get-processor-count)
+export NGINX_SERVER_NAMES_HASH_BUCKET_SIZE="64"
 export NGINX_PID_FILE="/var/run/nginx.pid"
 export NGINX_CLIENT_MAX_BODY_SIZE="5m" # @specify
 export NGINX_WORKER_CONNECTIONS="2000" # @specify
@@ -74,6 +75,8 @@ http {
   client_max_body_size $NGINX_CLIENT_MAX_BODY_SIZE;
   client_body_temp_path /var/spool/nginx-client-body 1 2;
 
+  server_names_hash_bucket_size $NGINX_SERVER_NAMES_HASH_BUCKET_SIZE;
+
   default_type application/octet-stream;
 
   include /etc/nginx/conf/*.conf;

data/ext/bash/lib/ubuntu.sh

@@ -25,6 +25,7 @@ function get-archtype {
 }
 
 function update-sources {
+  sed -i "/^# deb.*multiverse/ s/^# //" /etc/apt/sources.list
   apt-get -qq -y update
 }
 

data/ext/bash/vagrant/ffmpeg.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+function provision-vagrant-ffmpeg {
+  section "FFmpeg"
+  ffmpeg-install
+}

data/ext/bash/vps/system.sh

@@ -4,8 +4,10 @@ export VPS_SYSTEM_FQDN="" # @require
 export VPS_SYSTEM_ADMIN_AUTHORIZED_GITHUB_USERS="" # @require
 export VPS_SYSTEM_ADMIN_SUDO_PASSWORD="" # @require
 export VPS_SYSTEM_PRIVATE_IP="" # @specify
+export VPS_SYSTEM_DNS_SERVERS="208.67.222.222 208.67.220.220"
 export VPS_SYSTEM_ADMIN_USER="admin" # @specify
-export VPS_SYSTEM_PRIVATE_NETMASK="255.255.128.0"
+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_ALLOW_PRIVATE_IPS="" # @specify
@@ -119,8 +121,9 @@ auto eth0 eth0:0 eth0:1
 # Public interface
 iface eth0 inet static
  address $ip_addr
- netmask 255.255.255.0
+ netmask $VPS_SYSTEM_PUBLIC_NETMASK
  gateway $gateway
+ dns-nameservers $VPS_SYSTEM_DNS_SERVERS
 EOT
 
   if [ $VPS_SYSTEM_PRIVATE_IP ]; then
@@ -134,10 +137,7 @@ EOT
   fi
 
   announce "Restart networking"
-  /etc/init.d/networking restart
-
-  announce "Removing DHCP"
-  aptitude -q -y remove isc-dhcp-client dhcp3-client dhcpcd
+  service networking restart
 }
 
 function provision-vps-system {

data/lib/propro/cli.rb

@@ -51,6 +51,7 @@ module Propro
       end
     end
 
+    # I hate this immensely
     desc 'deploy SCRIPT', 'Builds a Propro script and then executes it remotely'
     option :server,   aliases: '-s', banner: '<server address>'
     option :password, aliases: '-p', banner: '<server password>'
@@ -84,17 +85,19 @@ module Propro
         session.scp.upload!(script_data, remote_script_path)
         session.exec!("chmod +x #{remote_script_path}")
         session.exec!("touch #{remote_log_path}")
-        tail = session.exec("tail -f #{remote_log_path}") do |ch|
-          ch.on_data do |ch, data|
-            STDOUT.write(data)
-            STDOUT.flush
-          end
+
+        tail = session.exec("tail -f #{remote_log_path}") do |ch, stream, data|
+          STDOUT.write(data)
+          STDOUT.flush
         end
 
         sleep 1 # ughhhhhh
         say_event 'run', remote_script_url
         puts
-        session.exec(remote_script_path)
+
+        session.exec(remote_script_path) do |ch|
+          ch.on_data { } # mute stdout
+        end
       end
     rescue IOError # uggghhhhhhhhhh
       say_event 'done', "#{address} is rebooting"
@@ -109,9 +112,11 @@ module Propro
     end
 
     def ask_password
-      STDIN.noecho do
+      pwd = STDIN.noecho do
         ask 'password:'
       end
+      puts
+      pwd
     end
 
     def absolute_path(path)

data/lib/propro/package.rb

@@ -10,6 +10,7 @@ module Propro
       lib/nginx
       lib/node
       lib/redis
+      lib/ffmpeg
       vps/system
       app
       app/rvm
@@ -17,6 +18,7 @@ module Propro
       app/nginx
       app/sidekiq
       app/monit
+      app/ffmpeg
       app/puma
       app/puma/nginx
       app/node
@@ -32,6 +34,7 @@ module Propro
       vagrant/rvm
       vagrant/node
       vagrant/nginx
+      vagrant/ffmpeg
       lib/extras
     ]
 

data/lib/propro/version.rb

@@ -1,3 +1,3 @@
 module Propro
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propro
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Carsten Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -95,8 +95,9 @@ files:
 - Rakefile
 - bin/propro
 - examples/vagrant.propro
-- examples/vps_webserver.propro
+- examples/webserver.propro
 - ext/bash/app.sh
+- ext/bash/app/ffmpeg.sh
 - ext/bash/app/monit.sh
 - ext/bash/app/nginx.sh
 - ext/bash/app/node.sh
@@ -111,6 +112,7 @@ files:
 - ext/bash/db/pg.sh
 - ext/bash/db/redis.sh
 - ext/bash/lib/extras.sh
+- ext/bash/lib/ffmpeg.sh
 - ext/bash/lib/nginx.sh
 - ext/bash/lib/node.sh
 - ext/bash/lib/pg.sh
@@ -120,6 +122,7 @@ files:
 - ext/bash/lib/system.sh
 - ext/bash/lib/ubuntu.sh
 - ext/bash/vagrant.sh
+- ext/bash/vagrant/ffmpeg.sh
 - ext/bash/vagrant/nginx.sh
 - ext/bash/vagrant/node.sh
 - ext/bash/vagrant/pg.sh

data/examples/vps_webserver.propro

@@ -1,51 +0,0 @@
-#     ____  _________  ____  _________
-#    / __ \/ ___/ __ \/ __ \/ ___/ __ \
-#   / /_/ / /  / /_/ / /_/ / /  / /_/ /
-#  / .___/_/   \____/ .___/_/   \____/
-# /_/              /_/
-#
-# Example provisioner for standalone web server
-#
-
-source :vps
-source :app
-source :db
-
-# vps/system
-set :vps_system_hostname, 'myapp'
-set :vps_system_fqdn, 'web1.myapp.com'
-set :vps_system_admin_authorized_github_users, %w[ ????? ????? ]
-set :vps_system_admin_sudo_password, '??????'
-set :vps_system_private_ip, '???.???.???.???' # Private network IP of VPS
-set :vps_system_admin_user, 'admin'
-provision 'vps/system'
-
-# app
-set :app_domain, 'myapp.com'
-set :app_authorized_github_users, %w[ ????? ????? ????? ]
-provision 'app'
-
-# app/rvm
-set :app_rvm_ruby_version, '2.0.0'
-provision 'app/rvm'
-
-# app/nginx
-provision 'app/nginx'
-
-# app/puma/nginx
-set :app_puma_nginx_access_log_file_name, 'myapp.access.log'
-set :app_puma_nginx_error_log_file_name, 'myapp.error.log'
-provision 'app/puma/nginx'
-
-# db/pg
-set :db_pg_name, 'myapp_production'
-set :db_pg_user, 'myapp'
-provision 'db/pg'
-
-# db/redis
-provision 'db/redis'
-
-# lib/extras
-set :extra_packages, %w[ imagemagick ]
-provision 'extras'
-